Campbell Barton aed306f219 recent merges lost changes in this file, manually merge changes from -r37078:37500

2011-07-25 10:14:02 +00:00

..

blender

recent merges lost changes in this file, manually merge changes from -r37078:37500

2011-07-25 10:14:02 +00:00

blenderplayer

svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:03:48 +00:00

creator

svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:03:48 +00:00

darwin

set svn end of lines to native

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

gameengine

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21: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