Merge remote-tracking branches 'derf/master' and 'origin/master'
Showing
- ChangeLog 3 additions, 0 deletionsChangeLog
- man/feh.pre 15 additions, 12 deletionsman/feh.pre
- src/filelist.c 5 additions, 5 deletionssrc/filelist.c
- src/index.c 85 additions, 121 deletionssrc/index.c
- src/index.h 33 additions, 0 deletionssrc/index.h
- src/options.c 7 additions, 24 deletionssrc/options.c
- src/options.h 1 addition, 3 deletionssrc/options.h
- src/slideshow.c 12 additions, 15 deletionssrc/slideshow.c
- src/thumbnail.c 40 additions, 140 deletionssrc/thumbnail.c
Loading
Please register or sign in to comment