Tamito Kajiyama 15ed834343 Merged changes in the trunk up to revision 51718. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/makesrna/intern/rna_scene.c release/datafiles/startup.blend		2012-10-29 01:09:12 +00:00
..
blender	Merged changes in the trunk up to revision 51718.	2012-10-29 01:09:12 +00:00
blenderplayer	Merged changes in the trunk up to revision 51718.	2012-10-29 01:09:12 +00:00
creator	Merged changes in the trunk up to revision 51718.	2012-10-29 01:09:12 +00:00
darwin	initial retina support for osx \ to take effect you must perhaps logout/in \i prefer in terminal: /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -v -f	2012-09-07 15:44:20 +00:00
gameengine	style cleanup	2012-10-27 10:42:28 +00:00
icons
tests	style cleanup	2012-10-22 08:15:51 +00:00
CMakeLists.txt
SConscript	Scons:	2012-06-30 22:44:36 +00:00