Tamito Kajiyama 4e0b1d9177 Merged changes in the trunk up to revision 39368. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py

2011-08-13 23:29:16 +00:00

..

blender

Merged changes in the trunk up to revision 39368.

2011-08-13 23:29:16 +00:00

blenderplayer

Merged changes in the trunk up to revision 39368.

2011-08-13 23:29:16 +00:00

creator

Merged changes in the trunk up to revision 38893.

2011-08-01 20:18:02 +00:00

darwin

set svn end of lines to native

2011-05-09 08:15:38 +00:00

gameengine

change BLO_library_append_begin to take a main argument rather then a context, means the BGE doesnt need to make a new empty context just to pass as an arg.

2011-08-05 05:26:19 +00:00

icons

set svn end of lines to native

2011-05-09 08:15:38 +00:00

tests

use static sets rather then tuples, python optimizes this case.

2011-08-08 05:21:37 +00:00

CMakeLists.txt

Code cleanup: remove source/kernel module, this wasn't really the kernel of

2011-05-06 20:18:42 +00:00

SConscript

Code cleanup: remove source/kernel module, this wasn't really the kernel of

2011-05-06 20:18:42 +00:00