projects / geeqie.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 900e65e 11b6ce5)
Merge remote-tracking branch 'origin/merge-requests/5'
authorKlaus Ethgen <Klaus@Ethgen.de>
Sun, 20 Jul 2014 12:54:56 +0000 (13:54 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Sun, 20 Jul 2014 12:54:56 +0000 (13:54 +0100)
commite79d3547fb650e5f45cb9c30707724c221fdfc20
tree231206c2302f3c48738f6499049f55c9eb285ebdtree | snapshot (tar.gz tar.bz2)
parent900e65e7e83060b5a4fa0b4b6a2a38d747fbec2ccommit | diff
parent11b6ce5218bca998f5a9a6b24fc5ce1beb87412dcommit | diff
Merge remote-tracking branch 'origin/merge-requests/5'

* origin/merge-requests/5:
  Fix crash when loading collection listing inexistent files.

This is now a combination of Leons patch 900e65e and merge request of
Laurent. Hopefully that is now a bit more stable.
src/filedata.c diff1 | diff2 | blob | history
Image viewer forked from GQView