Tamito Kajiyama 7fa096261a Merged changes in the trunk up to revision 52118. ...

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c

2012-11-12 00:30:55 +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 52118.

2012-11-12 00:30:55 +00:00

creator.c

Merged changes in the trunk up to revision 51718.

2012-10-29 01:09:12 +00:00