griefith/test

Go to file

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

build_files

Enable sndfile by default on win64

2011-01-05 09:00:28 +00:00

doc

Merged changes in the trunk up to revision 34010.

2011-01-02 18:34:32 +00:00

extern

rename blenderlib to blender_add_lib

2010-12-22 23:09:30 +00:00

intern

SVN maintenance.