svn merge ^/trunk/blender -r46335:46340
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 7 May 2012 23:23:55 +0000 (23:23 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 7 May 2012 23:23:55 +0000 (23:23 +0000)
commit4ace1fbbccdef1be7d119f77ba47d869bc6067c6
tree3164b106f221379a8425a3bc385ae2681b86ab13
parent1d5440350d36ef8891063464733cc6d6a434898f
parentd2d272711dd795d502ff773de890d8bf3f715cfa
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