From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Fri, 22 Apr 2011 10:29:12 +0000 (+0100)
Subject: Merge branch 'master' into ke
X-Git-Tag: v1.2~11^2~6^2
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=943d16a89d107e4619175597f4e83c953094f28b

Merge branch 'master' into ke

* master:
  Do not delete path settings when adding new directory
  Fix compiling issue
  Fix the windowsize
  Fix wrong line ending
---

943d16a89d107e4619175597f4e83c953094f28b