Blender Git Loki
Git Commits -> Revision bf19bf0
April 10, 2015, 21:42 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenlib/intern/BLI_filelist.c source/blender/imbuf/IMB_thumbs.h source/blender/imbuf/intern/thumbs.c |
Commit Details:
Full Hash: bf19bf0110e9e5a2fcc92e7cbf10b907d4a7f65b
Parent Commits: 465a5d2, eb8b241