Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 18 Aug 2018 09:18:55 +0000 (19:18 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 18 Aug 2018 09:18:55 +0000 (19:18 +1000)
commit9f25b2f278c3c5609828d5ac780c9f8dbadd9be2
tree49a311388f95640a99099c2f98491c65215d93a7
parent4d71579d3ba21ed1e51fc7c2d03e2d87f0327d77
parent4c22343271966752094b1e64af45fc5a5c6109b9
Merge branch 'master' into blender2.8
CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator_args.c