Merge branch 'master' into ke
authorKlaus Ethgen <Klaus@Ethgen.de>
Fri, 22 Apr 2011 10:29:12 +0000 (11:29 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Fri, 22 Apr 2011 10:29:12 +0000 (11:29 +0100)
* master:
  Do not delete path settings when adding new directory
  Fix compiling issue
  Fix the windowsize
  Fix wrong line ending


Trivial merge