Merge branch 'master' into gsoc-dir-split
commite6d21101faebe602cefca79c7055b2c49ecd8004
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Tue, 13 Jul 2010 14:18:05 +0000 (13 16:18 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Tue, 13 Jul 2010 14:18:05 +0000 (13 16:18 +0200)
tree001598c6f481010201a1303b00b6d8c930e2b28f
parent6d14746d1b101f3fff223c88d31d4a8e11463c9f
parent699acc1b7ff4957c1709ec9322927088d807cfc4
Merge branch 'master' into gsoc-dir-split
apps/settings.h