Merge branch 'master' into thumbs
Conflicts: Makefile
This commit is contained in:
commit
15041f6100
1 changed files with 1 additions and 1 deletions
2
main.c
2
main.c
|
@ -485,7 +485,7 @@ void run() {
|
|||
continue;
|
||||
} else if (timeout) {
|
||||
t.tv_sec = 0;
|
||||
t.tv_usec = 250;
|
||||
t.tv_usec = 75000;
|
||||
xfd = ConnectionNumber(win.env.dpy);
|
||||
FD_ZERO(&fds);
|
||||
FD_SET(xfd, &fds);
|
||||
|
|
Loading…
Add table
Reference in a new issue