Blender Git Loki
Git Commits -> Revision 6a0e403
Revision 6a0e403 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) February 4, 2015, 19:46 (GMT) |
Merge branch 'master' into gooseberry Conflicts: source/blender/blenkernel/BKE_image.h source/blender/blenkernel/intern/sequencer.c source/blender/imbuf/intern/anim_movie.c |
Commit Details:
Full Hash: 6a0e403a17fc112eb8e4b22283045359b354bb90
Parent Commits: 363a044, bdb3723