Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://github.com/derf/feh

  • Loading branch information...
commit cf6f0320c15abd753951990a963d5c94b180bbde 2 parents 10b7b1e + 877e634
@reald reald authored
Showing with 6 additions and 4 deletions.
  1. +5 −3 ChangeLog
  2. +1 −1  src/main.c
View
8 ChangeLog
@@ -1,10 +1,12 @@
-git HEAD
+Sun, 25 Mar 2012 13:13:26 +0200 Daniel Friesel <derf@finalrewind.org>
- * Add R, * and / aliases for <keypad begin>, <keypad *> and <keypad />
+* Release v2.5
+
+ * Add R, * and / bindings for <keypad begin>, <keypad *> and <keypad />
* Try to convert unloadable files with imagemagick for up to 5 seconds
* Add --magick-timeout option to set imagemagick conversion timeout or
disable it altogether
- * Clean up temporary / to-delete files when receiveng SIG{INT,TERM,QUIT}
+ * Clean up temporary / to-delete files when receiving SIG{INT,TERM,QUIT}
* Do not scroll past image borders when using key bindings
* --loadable / --unloadable: indicate result in exit status
View
2  src/main.c
@@ -41,10 +41,10 @@ int main(int argc, char **argv)
{
atexit(feh_clean_exit);
+ setup_signal_handlers();
init_parse_options(argc, argv);
init_imlib_fonts();
- setup_signal_handlers();
if (opt.display) {
init_x_and_imlib();
Please sign in to comment.
Something went wrong with that request. Please try again.