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

..

blender

Merged changes in the trunk up to revision 52340.

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

blenderplayer

Merged changes in the trunk up to revision 52340.

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

creator

Merged changes in the trunk up to revision 52340.

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

gameengine

BGE: Changing "transform_uv" -> "transformUV" in some error messages.

2012-11-18 20:38:27 +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

Scons:

2012-06-30 22:44:36 +00:00