summaryrefslogtreecommitdiff
path: root/src/options.h
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-03-16 19:13:47 +0100
committerDennis Real <github@tildepipe.org>2012-03-16 19:13:47 +0100
commit8e96382805eb77a82209df9d71dbf9c0dd1c4cdb (patch)
tree48c54b9715d88cb6e9f8455d689364b73b842f8f /src/options.h
parent77fa5aca182435f2771511832ea198d027393ceb (diff)
parent29cd868898660c58b1925bf3647c4c63b7bd3151 (diff)
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/options.h')
-rw-r--r--src/options.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/options.h b/src/options.h
index bee7c73..898e9ff 100644
--- a/src/options.h
+++ b/src/options.h
@@ -117,6 +117,8 @@ struct __fehoptions {
double slideshow_delay;
+ signed short magick_timeout;
+
Imlib_Font menu_fn;
};