Tamito Kajiyama 6cee7bb2b7 Merged changes in the trunk up to revision 52191. ...

Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h

2012-11-14 02:01:02 +00:00

..

extern/include

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00

intern

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 44797.

2012-03-10 21:56:23 +00:00

SConscript

Merged changes in the trunk up to revision 46045.

2012-04-29 00:59:04 +00:00