Brecht Van Lommel 0a4a36271f Cycles: fix merge problem with startup.blend

2011-06-23 10:33:15 +00:00

..

blender

Cycles: fix merge problem with startup.blend

2011-06-23 10:33:15 +00:00

blenderplayer

Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk

2011-06-21 15:47:18 +00:00

creator

Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk

2011-06-21 15:47:18 +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