Blender Git Commit Log

Git Commits -> Revision 4ace1fb

Revision 4ace1fb by Ove Murberg Henriksen (master)
May 7, 2012, 23:23 (GMT)
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

Commit Details:

Full Hash: 4ace1fbbccdef1be7d119f77ba47d869bc6067c6
SVN Revision: 46402
Parent Commits: 1d54403, d2d2727

By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021