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
..
blender	Merged changes in the trunk up to revision 54421.	2013-02-10 10:17:59 +00:00
blenderplayer	Merged changes in the trunk up to revision 54421.	2013-02-10 10:17:59 +00:00
creator	Merged changes in the trunk up to revision 54421.	2013-02-10 10:17:59 +00:00
gameengine	Bug fix #34157	2013-02-09 12:30:42 +00:00
icons	Added GPL header to sconscripts!	2012-12-17 08:01:43 +00:00
tests	fix for regression in bpy-api, python context passed to operators couldn't override collections.	2013-02-07 04:04:12 +00:00
CMakeLists.txt
SConscript	Added GPL header to sconscripts!	2012-12-17 08:01:43 +00:00