Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Dec 2018 13:41:00 +0000 (14:41 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Dec 2018 13:41:00 +0000 (14:41 +0100)
commitfb3f1a35676e830358ec68ae8153e076253930b4
tree41f8d33b916dcbe0cd54e87b4335cd26ae8da896
parentbe359fc6e51a98143961cb01901761d059aaacfd
parentc9344d6c5b0533629966c6baa853591f345af00a
Merge branch 'master' into blender2.8
build_files/build_environment/install_deps.sh
intern/ghost/intern/GHOST_SystemX11.cpp