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	Move Oxygen kwin decoration to the oxygen folder	2014-03-24 16:43:11 +01:00
Messages.sh	Remove temporary file	2008-07-02 07:04:51 +00:00