diff options
author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
---|---|---|
committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/WindowState.hh | |
parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/WindowState.hh')
-rw-r--r-- | src/WindowState.hh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/WindowState.hh b/src/WindowState.hh index 883443a..6409d13 100644 --- a/src/WindowState.hh +++ b/src/WindowState.hh | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include "Layer.hh" | 25 | #include "Layer.hh" |
26 | 26 | ||
27 | #include <X11/Xlib.h> | ||
27 | #include <X11/Xutil.h> | 28 | #include <X11/Xutil.h> |
28 | 29 | ||
29 | #include <string> | 30 | #include <string> |