Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 18:41:10 +0000 (20:41 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 18:41:10 +0000 (20:41 +0200)
commitcfc4805455bc03f5f810d0d234880727284e93cf
tree4739036dbf710d53389ef98b611e9c8e1e3d361e
parent18e316bcb9f4aa7221f82a40fd3307cde7eaffbb
parent8f49299134b504a59558aad8e66a81ae3c6c9748
Merge branch 'master' into blender2.8
intern/ghost/intern/GHOST_SystemX11.cpp
source/blender/windowmanager/intern/wm_event_system.c