Tamito Kajiyama 141dd5233e Merged changes in the trunk up to revision 50257. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt

2012-08-29 00:53:29 +00:00

..

buildinfo.c

style cleanup: mostly whitespace in rna

2012-05-12 11:01:29 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 49986.

2012-08-18 15:20:35 +00:00

creator.c

Merged changes in the trunk up to revision 50257.

2012-08-29 00:53:29 +00:00