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

..

blender

Merged changes in the trunk up to revision 50257.

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

blenderplayer

Merged changes in the trunk up to revision 50257.

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

creator

Merged changes in the trunk up to revision 50257.

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

darwin

…

gameengine

BGE: Make sure lib loaded cameras are added to the active scene's camera list.

2012-08-26 23:17:50 +00:00

icons

…

tests

…

CMakeLists.txt

…

SConscript

Scons:

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