Martin Gräßlin d96af81f5e Merge branch 'Plasma/5.0' ... Conflicts: kcmkwin/kwindesktop/desktop.desktop		2014-09-08 10:07:57 +02:00
..
aurorae	Merge branch 'Plasma/5.0'	2014-09-08 10:07:57 +02:00
CMakeLists.txt
Messages.sh