Merge branch '1.0'
authorMilian Wolff <mail@milianw.de>
Sun, 8 Aug 2010 23:07:59 +0000 (01:07 +0200)
committerMilian Wolff <mail@milianw.de>
Sun, 8 Aug 2010 23:07:59 +0000 (01:07 +0200)
commit0c2db253acdaa5c9bb646e442db1fa6acbd7ee29
tree6280c2529c5e039ca4890199e314925e5b6ce726
parent27c65b400c0fafdb12c4276cac1db0644903f0fa
parent673e50407bbbde8a443ca2229ba3fc8046ff32cb
Merge branch '1.0'
shell/settings/ccconfig.kcfg