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)
commit943d16a89d107e4619175597f4e83c953094f28b
tree13b2c4e7fee39f9c2a832b4c5b3b7dd6c0daf508
parent556bd46ba743932fd29c225918d8aae722f6a054
parent31f6b82dbee7f4456371a1b527161ebc81342577
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