Ove Murberg Henriksen 4ace1fbbcc svn merge ^/trunk/blender -r46335:46340 ...

1 tree conflict. Resolved:
	I deleted source/tools/GL. 
	Then I checked out folder from trunk (revision 46340)
	Then I ran: resolve --accept working source/tools/GL

2012-05-07 23:23:55 +00:00

..

blender

svn merge ^/trunk/blender -r46335:46340

2012-05-07 23:23:55 +00:00

blenderplayer

code cleanup: naming - pose/armature/image

2012-05-05 16:03:57 +00:00

creator

code cleanup: BKE_ naming, also make bpy.data.images.load() always load a new image. (not use existing one)

2012-05-05 14:52:04 +00:00

darwin

replace former applescript with an editable one

2011-10-19 19:15:35 +00:00

gameengine

svn merge ^/trunk/blender -r46300:46330

2012-05-07 01:04:52 +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