Benoit Bolsee ca170a8ed6 forgot to resolve one conflict in previous merge		2011-09-09 12:37:56 +00:00
..
blender	forgot to resolve one conflict in previous merge	2011-09-09 12:37:56 +00:00
blenderplayer	Fix for blender player linker bug, missing a stub function used in RNA.	2011-09-05 22:04:23 +00:00
creator	svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-09-07 15:34:04 +00:00
darwin	set svn end of lines to native	2011-05-09 08:15:38 +00:00
gameengine	svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-09-09 12:21:41 +00:00
icons	set svn end of lines to native	2011-05-09 08:15:38 +00:00
tests	minor warning fixes, also correct some float -> double promotions in shadeoutput.c	2011-09-02 03:32:57 +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