Blender Git Loki
Git Commits -> Revision e8c945b
Revision e8c945b by Ove Murberg Henriksen (master) May 8, 2012, 00:09 (GMT) |
svn merge ^/trunk/blender -r46370:46380 1 Tree conflict I deleted the source/tools/GL and then ran: svn -r46380 co https://svn.blender.org/svnroot/bf-blender/trunk/blender/source/tools/GL svn resolve --accept working -R source/tools/GL |
Commit Details:
Full Hash: e8c945bfb9ec03f486a1df4dd9b0ea5c833c3ee8
SVN Revision: 46406
Parent Commits: 03f0b47, f618bad