Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Aug 2018 11:00:19 +0000 (13:00 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Aug 2018 11:00:19 +0000 (13:00 +0200)
commit3f2090f401f2e0c63fc25a4be72d342a564cff2e
tree7e25dbc75256ab77824b4607398950af8e54c530
parentf18de82cd41ad04c29ee711e7b80b13b67505493
parent671c54f692f632b29dd56d444dc4bc369c92de59
Merge branch 'master' into blender2.8
build_files/buildbot/config/blender_linux.cmake
build_files/buildbot/slave_compile.py
build_files/cmake/config/blender_release.cmake
intern/ghost/intern/GHOST_SystemX11.cpp