Blender Git Loki
Git Commits -> Revision 231a795
Revision 231a795 by Julian Eisel (soc-2016-layer_manager) August 4, 2016, 02:43 (GMT) |
Merge branch 'master' into soc-2016-layer_manager Conflicts: source/blender/blenkernel/BKE_blender_version.h source/blender/blenloader/intern/versioning_270.c source/blender/editors/screen/screen_context.c |
Commit Details:
Full Hash: 231a7950605eb9f160681523ce13413edc544a50
Parent Commits: 14720e2, 72c646b