Martin Gräßlin 577a7030b6 Merge branch 'KDE/4.10' ... Conflicts: kwin/clients/aurorae/src/aurorae.cpp		2013-03-13 08:09:53 +01:00
..
config	Support for Plastik's configuration options	2012-08-26 20:59:37 +02:00
ui	Merge branch 'KDE/4.10'	2013-03-13 08:09:53 +01:00