diff options
author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /intern/ghost/intern/GHOST_WindowX11.cpp | |
parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'intern/ghost/intern/GHOST_WindowX11.cpp')
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 349b11728bd..3bece605d45 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -22,18 +22,18 @@ */ /* For standard X11 cursors */ -#include <X11/cursorfont.h> #include <X11/Xatom.h> -#include <X11/Xutil.h> #include <X11/Xmd.h> +#include <X11/Xutil.h> +#include <X11/cursorfont.h> #ifdef WITH_X11_ALPHA # include <X11/extensions/Xrender.h> #endif -#include "GHOST_WindowX11.h" -#include "GHOST_SystemX11.h" +#include "GHOST_Debug.h" #include "GHOST_IconX11.h" +#include "GHOST_SystemX11.h" +#include "GHOST_WindowX11.h" #include "STR_String.h" -#include "GHOST_Debug.h" #ifdef WITH_XDND # include "GHOST_DropTargetX11.h" @@ -54,15 +54,15 @@ // For DPI value #include <X11/Xresource.h> -#include <cstring> #include <cstdio> +#include <cstring> /* gethostname */ #include <unistd.h> #include <algorithm> -#include <string> #include <math.h> +#include <string> /* For obscure full screen mode stuff * lifted verbatim from blut. */ |