diff options
author | Dennis Real <github@tildepipe.org> | 2012-03-16 22:22:28 +0100 |
---|---|---|
committer | Dennis Real <github@tildepipe.org> | 2012-03-16 22:22:28 +0100 |
commit | 39cbd1ed2b6693beea5e974a6ae83207c6e9a826 (patch) | |
tree | 933d66905ce488512c1b7eabeab56fe4b712e84c /src | |
parent | 9e1bbf874500e99506baffec3c6b54ed04e60a2f (diff) | |
parent | a1001232297445566a68519129f177d6ffeee479 (diff) |
Merge remote branch 'upstream/master'
Diffstat (limited to 'src')
-rw-r--r-- | src/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/options.c b/src/options.c index a277003..0d4d745 100644 --- a/src/options.c +++ b/src/options.c @@ -53,7 +53,7 @@ void init_parse_options(int argc, char **argv) opt.display = 1; opt.aspect = 1; opt.slideshow_delay = 0.0; - opt.magick_timeout = 10; + opt.magick_timeout = 5; opt.thumb_w = 60; opt.thumb_h = 60; opt.thumb_redraw = 10; |