Tamito Kajiyama 2585d52405 Merged changes in the trunk up to revision 46045. ... Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/blenkernel/intern/subsurf_ccg.c source/blender/editors/mesh/editmesh_tools.c source/blender/makesdna/DNA_scene_types.h		2012-04-29 00:59:04 +00:00
..
blender	Merged changes in the trunk up to revision 46045.	2012-04-29 00:59:04 +00:00
blenderplayer	Merged changes in the trunk up to revision 45820.	2012-04-21 00:33:36 +00:00
creator	Merged changes in the trunk up to revision 46045.	2012-04-29 00:59:04 +00:00
darwin	replace former applescript with an editable one	2011-10-19 19:15:35 +00:00
gameengine	revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too	2012-04-24 16:14:23 +00:00
icons	set svn end of lines to native	2011-05-09 08:15:38 +00:00
tests	rename Mesh.uv_loop_layers --> uv_layers	2012-04-22 23:51:50 +00:00
CMakeLists.txt	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
SConscript	Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications.	2012-04-24 12:57:58 +00:00