Blender Git Commit Log

Git Commits -> Revision f0653c3

September 1, 2014, 13:38 (GMT)
Merge branch 'master' into soc-2014-viewport_context

Also fix scons issues with SDL. There is still a linking problem
somewhere but i expect this is an issue in master as well.

Conflicts:
intern/cycles/SConscript
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/nodes/CMakeLists.txt

Commit Details:

Full Hash: f0653c3d3f1b24b45e6f1c5ac659bf130b58af3f
Parent Commits: 575cbf0, a8d2a6f

By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021