Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-11-19 00:41:11 +00:00

..

bad_level_call_stubs

Merged changes in the trunk up to revision 52118.

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

CMakeLists.txt

move source/darwin into release/darwin since these files are for osx packaging.

2012-11-18 07:41:38 +00:00