Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 21 Mar 2018 15:27:48 +0000 (16:27 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 21 Mar 2018 15:27:48 +0000 (16:27 +0100)
commit69eb452622e9af340f14b7116d59e450c3b6c745
treebe5dd24893507bbba968d3114da06de60e9e83eb
parent3ea8710b9daaed9bbf160c8b7895f2d6fdb0337c
parent5ba5254ec1ebba6c1e89b663592d716b92e13165
Merge branch 'master' into blender2.8
intern/ghost/GHOST_C-api.h
intern/ghost/GHOST_ISystem.h
intern/ghost/intern/GHOST_C-api.cpp
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h
release/scripts/startup/bl_ui/space_userpref.py
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/blender/windowmanager/wm_window.h