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
..
CMakeLists.txt	Another big patch set by Bastien Montagne, thanks a lot!	2012-12-20 07:57:26 +00:00
SConscript	Another big patch set by Bastien Montagne, thanks a lot!	2012-12-20 07:57:26 +00:00
stubs.c	Merged changes in the trunk up to revision 54421.	2013-02-10 10:17:59 +00:00