Tamito Kajiyama dd8e836067 Merged changes in the trunk up to revision 51853. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/bmesh/operators/bmo_utils.c This commit also includes a fix of a bug identified during the merge and committed in revision 51853. Thanks Thomas (dingto) for the timely fix!		2012-11-04 02:22:56 +00:00
..
blender	Merged changes in the trunk up to revision 51853.	2012-11-04 02:22:56 +00:00
blenderplayer	Merged changes in the trunk up to revision 51853.	2012-11-04 02:22:56 +00:00
creator	Merged changes in the trunk up to revision 51853.	2012-11-04 02:22:56 +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	code cleanup: cmake - add missing headers, remove directories from source listing.	2012-11-03 15:49:38 +00:00
icons
tests	code cleanup: cmake - add missing headers, remove directories from source listing.	2012-11-03 15:49:38 +00:00
CMakeLists.txt
SConscript	Scons:	2012-06-30 22:44:36 +00:00