Tamito Kajiyama ac9ec06ec1 Merged changes in the trunk up to revision 54421. ... Conflicts resolved: release/datafiles/startup.blend release/scripts/startup/bl_ui/properties_render.py source/blender/SConscript source/blender/blenloader/intern/readfile.c		2013-02-10 10:17:59 +00:00
..
bad_level_call_stubs	Merged changes in the trunk up to revision 54421.	2013-02-10 10:17:59 +00:00
CMakeLists.txt	Move opencl and reigidbody from source/blender/ to intern/	2013-02-01 06:24:49 +00:00