Merge branch 'master' into thumbs · 15041f6100 - sxiv - My awesome git server

Merge branch 'master' into thumbs

Conflicts:
	Makefile

master

Bert 13 years ago

parent

783213c0bb caf982d175

commit

15041f6100

1 changed files with 1 additions and 1 deletions

Unified View

							
								+ 1
								
								- 1
							
main.cView 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);