Blender Git Loki
Git Commits -> Revision e53cdbf
January 7, 2015, 11:44 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/editors/include/UI_interface_icons.h source/blender/editors/interface/interface_icons.c source/blender/windowmanager/intern/wm_files.c |
Commit Details:
Full Hash: e53cdbf62f785691f800ed275b34e9678ba853ee
Parent Commits: 820b6b3, d46c9b8