Sergey Sharybin d30504ce73 Probably merging conflict. Reverting startup.blend to version from trunk. ...

In my local GIT repo i've got rid of changing startup.blend -- it's unneeded
due to all needed stuff should be done via themes do_versions.

2011-06-22 16:16:25 +00:00

..

blender

Probably merging conflict. Reverting startup.blend to version from trunk.

2011-06-22 16:16:25 +00:00

blenderplayer

Merging r37594 through r37703 from trunk into soc-2011-tomato

2011-06-21 18:24:00 +00:00

creator

Merging r37704 through r37731 from trunk into soc-2011-tomato

2011-06-22 14:44:54 +00:00

darwin

set svn end of lines to native

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

gameengine

rename cmake include/libraries to conform with suggested cmake names

2011-06-18 14:12:54 +00:00

icons

set svn end of lines to native

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

tests

update for tests, error out when duplicate modules are found, all ctest tests pass again.

2011-06-09 16:20:00 +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