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

..

blender

Merged changes in the trunk up to revision 52118.

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

blenderplayer

Merged changes in the trunk up to revision 52118.

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

creator

Merged changes in the trunk up to revision 52118.

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

darwin

…

gameengine

Replacing gettext i18n backend by boost::locale one.

2012-11-11 16:54:26 +00:00

icons

…

tests

code cleanup: cmake - add missing headers, remove directories from source listing.

2012-11-03 15:49:38 +00:00

CMakeLists.txt

…

SConscript

…