diff options
author | Sven Willner <sven.willner@gmail.com> | 2019-04-01 13:58:50 +0200 |
---|---|---|
committer | Sven Willner <sven.willner@gmail.com> | 2019-04-01 13:58:50 +0200 |
commit | a9ffd5d2234433bc3f3829713b0968a1d6c13b94 (patch) | |
tree | 78a78930edbf7c187e0803f367529f2aabc90627 /src/options.h | |
parent | 1d3d1259590c8a600c3d800942ab5566802d3499 (diff) | |
parent | 18dd1c5ea218c1b86e305d3ee0052335b1e22fc8 (diff) |
Merge remote-tracking branch 'original/master'
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 cae04ec..883c8e2 100644 --- a/src/options.h +++ b/src/options.h @@ -36,7 +36,6 @@ enum on_last_slide_action { struct __fehoptions { unsigned char multiwindow; unsigned char montage; - unsigned char collage; unsigned char index; unsigned char thumbs; unsigned char slideshow; @@ -85,6 +84,7 @@ struct __fehoptions { unsigned char keep_zoom_vp; unsigned char insecure_ssl; unsigned char filter_by_dimensions; + unsigned char edit; char *output_file; char *output_dir; @@ -100,7 +100,6 @@ struct __fehoptions { char *filelistfile; char *menu_font; char *customlist; - char *menu_bg; char *caption_path; char *start_list_at; char *info_cmd; |