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)
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


Trivial merge