Blender Git Commit Log
Git Commits -> Revision 8f4d6f6
January 3, 2015, 16:07 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenkernel/BKE_camera.h source/blender/blenkernel/intern/camera.c source/blender/blenlib/BLI_fileops.h source/blender/blenlib/intern/storage.c source/blender/editors/space_file/filelist.c source/blender/makesrna/intern/rna_object_api.c tests/gtests/blenlib/BLI_path_util_test.cc |
Commit Details:
Full Hash: 8f4d6f62ea02de2c5589087c2bd9928874844fcf
Parent Commits: 55c792d, d8b00a3