projects / geeqie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83ae99a 943d16a)
Merge branches 'master' and 'ke' into ke-lua
authorKlaus Ethgen <Klaus@Ethgen.de>
Fri, 22 Apr 2011 10:29:35 +0000 (11:29 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Fri, 22 Apr 2011 10:29:35 +0000 (11:29 +0100)
* master:
  Do not delete path settings when adding new directory
  Fix compiling issue
  Fix the windowsize
  Fix wrong line ending

* ke:
  Do not delete path settings when adding new directory
  Fix compiling issue
  Fix the windowsize
  Fix wrong line ending
  Do not delete path settings when adding new directory
  Swedish tranlation


Trivial merge
Image viewer forked from GQView