diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-29 00:21:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-29 00:21:00 +0300 |
| commit | 0b443c8a232b021bff9f5bd17d66c71aa7694df7 (patch) | |
| tree | 80268c08b581c15e12e32c352847668baac0f45a /source/blender/windowmanager/intern/wm.c | |
| parent | 6336b215a9cb1a90b6aaa65f39033fc23cfe1591 (diff) | |
| parent | 915235c87a1621ba000a427ad3eac8a49ff2c0c7 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/windowmanager/intern/wm.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 9a89734e2c6..a18fe027b12 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -39,8 +39,6 @@ #include "DNA_windowmanager_types.h" -#include "GHOST_C-api.h" - #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" @@ -59,7 +57,6 @@ #include "WM_types.h" #include "wm_window.h" #include "wm_event_system.h" -#include "wm_event_types.h" #include "wm_draw.h" #include "wm.h" |