diff options
author | Bert <ber.t@gmx.com> | 2011-02-17 13:10:55 +0100 |
---|---|---|
committer | Bert <ber.t@gmx.com> | 2011-02-17 13:10:55 +0100 |
commit | 15041f610024a6bd5677ccd3f9086cd5a8d64e96 (patch) | |
tree | d2dcd4ddfbe0b4f0192f67976a5f53862f647621 | |
parent | 783213c0bbc1b52504c346588742095a766f052d (diff) | |
parent | caf982d175729603eee4f19382394ab66d4a469c (diff) | |
download | nsxiv-15041f610024a6bd5677ccd3f9086cd5a8d64e96.tar.zst |
Merge branch 'master' into thumbs
Conflicts:
Makefile
-rw-r--r-- | main.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |