Commit 676ff730 authored by Dennis Real's avatar Dennis Real
Browse files

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

parents 50676a24 a62c48c7

ChangeLog

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ git HEAD 
      <https://github.com/derf/feh/issues/91>

    * menu: simpler background, remove drop shadows

    * Remove --menu-style support (deprecated in 1.12)

    * Allow --slideshow-delay and --reload to be used together



Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>

man/feh.pre

+1 −1
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ An example entry would be 
.

.Pp

.

You cane use this theme in two ways.  Either call

You can use this theme in two ways.  Either call

.Qo

.Nm

-Timagemap *.jpg

src/slideshow.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ void init_slideshow_mode(void) 
			winwidget_show(w);

			if (opt.slideshow_delay > 0.0)

				feh_add_timer(cb_slide_timer, w, opt.slideshow_delay, "SLIDE_CHANGE");

			else if (opt.reload > 0)

			if (opt.reload > 0)

				feh_add_unique_timer(cb_reload_timer, w, opt.reload);

			break;

		} else {