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
..
buildinfo.c	style cleanup: mostly whitespace in rna	2012-05-12 11:01:29 +00:00
CMakeLists.txt	Merged changes in the trunk up to revision 51853.	2012-11-04 02:22:56 +00:00
creator.c	Merged changes in the trunk up to revision 51718.	2012-10-29 01:09:12 +00:00