Mercurial > geeqie.yaz
diff src/slideshow.c @ 1581:cef502852c4f
resolved conflict
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Fri, 01 May 2009 15:48:11 +0900 |
parents | 24a12aa0cb54 |
children | 66d4bd637fd7 |
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Fri, 01 May 2009 15:48:11 +0900 |
parents | 24a12aa0cb54 |
children | 66d4bd637fd7 |