Blender Git Loki
Git Commits -> Revision 9ff1ebe
October 23, 2014, 13:12 (GMT) |
Merge remote-tracking branch 'origin/master' into soc-2014-fluid Conflicts: .gitignore intern/cycles/CMakeLists.txt source/blender/blenkernel/intern/smoke.c source/blender/python/intern/bpy_interface.c source/creator/CMakeLists.txt |
Commit Details:
Full Hash: 9ff1ebed52e0f858a395eeea4caf89304e068b2d
Parent Commits: a2ed11c, eaaeae4