Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2018 15:34:10 +0000 (17:34 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2018 15:34:10 +0000 (17:34 +0200)
commit5852420023f792fef41825d2ab9410b280581e0b
treec5a56b69e743e769f826d166d7a5bb3a69616690
parentdc123ac9e5a135f018ebceda4d282346a8bba094
parente6af8758c86099790b003454195c4a748251c6a4
Merge branch 'master' into blender2.8
intern/ghost/intern/GHOST_SystemX11.cpp