Brecht Van Lommel b25346a48c Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/		2011-05-05 10:14:56 +00:00
..
buildinfo.c	fix #if errors, add defined() in proper places	2011-02-25 10:01:33 +00:00
CMakeLists.txt	Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/	2011-05-05 10:14:56 +00:00
creator.c	Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/	2011-05-05 10:14:56 +00:00
SConscript	rename and negate DISABLE_PYTHON --> WITH_PYTHON	2010-10-31 04:11:39 +00:00