Blender Git Loki
Git Commits -> Revision 7cea6ec
Revision 7cea6ec by Antonis Ryakiotakis (temp_viewport_fx_merge) April 14, 2015, 12:13 (GMT) |
Merge branch 'master' into temp_viewport_fx_merge Conflicts: source/blender/editors/interface/interface_widgets.c source/blender/editors/space_graph/graph_draw.c |
Commit Details:
Full Hash: 7cea6ecddb4630961c1393ed2f1ada4aa81de1df
Parent Commits: 04daaee, 87cb1cc