Blender Git Loki
Git Commits -> Revision e5a4756
April 7, 2015, 12:19 (GMT) |
Merge branch 'master' into gooseberry Conflicts: source/blender/blenkernel/intern/image.c source/blender/blenkernel/intern/object_dupli.c source/blender/blenkernel/intern/sequencer.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/space_view3d/view3d_ops.c source/blender/makesdna/DNA_sequence_types.h source/blender/makesdna/DNA_view3d_types.h source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/intern/wm_operators.c source/blenderplayer/bad_level_call_stubs/stubs.c |
Commit Details:
Full Hash: e5a47562eb55b6434b8a141f896c1ee0f89d4b25
Parent Commits: 7ffdbec, d60ff6c