Merge remote-tracking branch '4z3/set-user-specified-sizehints' into sizehints

Conflicts: window.c
2013-02-09 01:21:57 +01:00
parent f7301cf4f9 3f25b907bd
commit bf41012493
3 changed files with 53 additions and 19 deletions
--- a/main.c
+++ b/main.c
@ -26,7 +26,6 @@
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <X11/Xutil.h>
 #include <X11/keysym.h>

 #include "types.h"