At last... this merge should finally do the trick!
authorJoshua Leung <aligorith@gmail.com>
Thu, 25 Jun 2009 04:33:21 +0000 (04:33 +0000)
committerJoshua Leung <aligorith@gmail.com>
Thu, 25 Jun 2009 04:33:21 +0000 (04:33 +0000)
commita1c5c501a6b4b8bfdee6f60869c122fb6f321726
treeb2bd0a250560638b3f08627494eeb002e067a8c9
parente5f6a41b1b7125a4c3bc7ef2554c04b768ac765c
parent7a357cba3994bee7d05c7a8bf5736eb94067d564
At last... this merge should finally do the trick!

21073 to 21145
28 files changed:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/include/ED_keyframes_draw.h
source/blender/editors/interface/resources.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_space.c
source/blender/python/generic/Geometry.c
source/blender/python/generic/quat.c
source/gameengine/Ketsji/KX_GameObject.h