diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2018-08-05 13:57:45 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2018-08-05 13:57:45 +0200 |
| commit | 607374d4c7f7a133d3d1c5c012a6a5af9e2e60bf (patch) | |
| tree | a430975e4b21cc780962be203e50fe118524157c /src/options.h | |
| parent | 3b524947ce86e0120e5401e12b6bfa6a4ff3a918 (diff) | |
Merge --dcraw-timeout and --magick-timeout into --conversion-timeout
Diffstat (limited to 'src/options.h')
| -rw-r--r-- | src/options.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/options.h b/src/options.h index 741b0c7..936b4bd 100644 --- a/src/options.h +++ b/src/options.h @@ -133,8 +133,7 @@ struct __fehoptions { double slideshow_delay; - signed short dcraw_timeout; - signed short magick_timeout; + signed int conversion_timeout; Imlib_Font menu_fn; }; |