Blender Git Loki
Git Commits -> Revision e182f7b
May 9, 2016, 21:57 (GMT) |
Merge branch 'master' into wiggly-widgets Conflicts: source/blender/editors/include/BIF_glutil.h source/blender/editors/screen/glutil.c source/blender/editors/space_image/image_draw.c |
Commit Details:
Full Hash: e182f7b8e20466af914ae386932d44333d3c6b23
Parent Commits: dc82c2c, f9f34b5