Blender Git Loki
Git Commits -> Revision ca05c3c
Revision ca05c3c by Julian Eisel (soc-2016-layer_manager) October 12, 2016, 20:07 (GMT) |
Merge branch 'master' into soc-2016-layer_manager Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/interface/resources.c |
Commit Details:
Full Hash: ca05c3cca988db1e3d55c49978fe5ad856a95c41
Parent Commits: 2bb4961, 2d03edb