Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-08-08 22:37:47 +02:00
commit 20cc9cfe70
1 changed files with 1 additions and 0 deletions

View File

@ -13,6 +13,7 @@
#include "all.h" #include "all.h"
#include <time.h> #include <time.h>
#include <float.h>
#include <sys/time.h> #include <sys/time.h>
#include <xcb/randr.h> #include <xcb/randr.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>