Blender Git Loki
Git Commits -> Revision 82c2daa
Revision 82c2daa by Sebastián Barschkis (fluid-mantaflow) August 15, 2015, 11:34 (GMT) |
Merge branch 'master' into soc-2014-fluid Conflicts: CMakeLists.txt extern/CMakeLists.txt extern/SConscript intern/ghost/intern/GHOST_WindowCocoa.mm source/creator/CMakeLists.txt |
Commit Details:
Full Hash: 82c2daa2484a2526260aa2542c23b8018aa2f0be
Parent Commits: 119cda0, 3d397d2