Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/bmesh/intern/bmesh_construct.c source/blender/bmesh/intern/bmesh_mesh_conv.c source/blender/bmesh/intern/bmesh_mesh_conv.h source/blender/editors/interface/interface_templates.c source/blender/editors/interface/resources.c source/blender/editors/mesh/bmesh_select.c source/blender/editors/mesh/bmesh_tools.c source/blender/editors/space_view3d/drawobject.c source/blender/render/intern/source/shadeoutput.c		2012-03-25 08:20:19 +00:00
..
blender	Merged changes in the trunk up to revision 45133.	2012-03-25 08:20:19 +00:00
blenderplayer	Merged changes in the trunk up to revision 45133.	2012-03-25 08:20:19 +00:00
creator	Merged changes in the trunk up to revision 45133.	2012-03-25 08:20:19 +00:00
darwin	replace former applescript with an editable one	2011-10-19 19:15:35 +00:00
gameengine	style cleanup: follow style guide for/with/if spacing	2012-03-24 07:52:14 +00:00
icons	set svn end of lines to native	2011-05-09 08:15:38 +00:00
tests	spelling cleanup	2012-03-18 07:38:51 +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	Code cleanup: remove source/kernel module, this wasn't really the kernel of	2011-05-06 20:18:42 +00:00