Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2018 09:23:10 +0000 (11:23 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2018 09:23:10 +0000 (11:23 +0200)
commit0bfc06b7b7ef797df12a99bdd3630756e590df88
treea9424eab0486a48ff92778094ae7187be488d25d
parentcec8ca6619e32b0a9e92d7aba8220c6207858290
parent719629f2aa8cc146427b68bd6fcf422bdd1e52b0
Merge branch 'master' into blender2.8
intern/ghost/intern/GHOST_WindowX11.cpp