Tamito Kajiyama 353713afe8 Merged changes in the trunk up to revision 40096. ... Conflicts resolved: source/blender/makesrna/intern/rna_scene.c source/blender/python/intern/CMakeLists.txt Note for branch builders: Enabling Blender Player may cause linker errors.		2011-09-10 13:36:27 +00:00
..
blender	Merged changes in the trunk up to revision 40096.	2011-09-10 13:36:27 +00:00
blenderplayer	Merged changes in the trunk up to revision 40096.	2011-09-10 13:36:27 +00:00
creator	Merged changes in the trunk up to revision 40096.	2011-09-10 13:36:27 +00:00
darwin	set svn end of lines to native	2011-05-09 08:15:38 +00:00
gameengine	fix for building with collada and some other warnings	2011-09-10 09:38:38 +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