Merge branch 'master' into thumbs

Conflicts:
	Makefile
This commit is contained in:
Bert 2011-02-17 13:10:55 +01:00
commit 15041f6100

2
main.c
View File

@ -485,7 +485,7 @@ void run() {
continue; continue;
} else if (timeout) { } else if (timeout) {
t.tv_sec = 0; t.tv_sec = 0;
t.tv_usec = 250; t.tv_usec = 75000;
xfd = ConnectionNumber(win.env.dpy); xfd = ConnectionNumber(win.env.dpy);
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(xfd, &fds); FD_SET(xfd, &fds);