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)
commitba07cafe7ae515da81a3f4cb4a39a679305a62b2
treebcfec1aa9448b2e2990864af1098176bd74cda13
parent83ae99a601593bf1161d07da7ef03892f03a7df9
parent943d16a89d107e4619175597f4e83c953094f28b
Merge branches 'master' and 'ke' into ke-lua

* 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