Tamito Kajiyama
0ec378f3fe
Merged changes in the trunk up to revision 34193.
Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h
2011-01-09 15:07:14 +00:00
..
2010-12-22 23:09:30 +00:00
2011-01-08 12:43:44 +00:00
2011-01-09 15:07:14 +00:00
2011-01-09 15:07:14 +00:00
2011-01-09 15:07:14 +00:00
2010-12-22 23:09:30 +00:00
2011-01-07 18:36:47 +00:00
2011-01-09 15:07:14 +00:00
2011-01-09 15:07:14 +00:00
2011-01-08 10:13:59 +00:00
2011-01-07 19:18:31 +00:00
2011-01-08 12:22:16 +00:00
2011-01-09 15:07:14 +00:00
2011-01-09 15:07:14 +00:00
2011-01-08 12:43:44 +00:00
2011-01-07 19:18:31 +00:00
2011-01-09 15:07:14 +00:00
2010-12-22 23:09:30 +00:00
2010-12-22 23:09:30 +00:00
2011-01-09 15:07:14 +00:00
2011-01-08 12:43:44 +00:00
2010-12-18 11:49:12 +00:00
2010-08-10 21:22:26 +00:00
2010-08-09 11:32:55 +00:00