Martin Gräßlin 577a7030b6 Merge branch 'KDE/4.10' ... Conflicts: kwin/clients/aurorae/src/aurorae.cpp		2013-03-13 08:09:53 +01:00
..
aurorae	Merge branch 'KDE/4.10'	2013-03-13 08:09:53 +01:00
b2	s/KLocale/KLocalizedString/g	2013-03-07 13:59:15 +01:00
laptop	s/KLocale/KLocalizedString/g	2013-03-07 13:59:15 +01:00
oxygen	s/KLocale/KLocalizedString/g	2013-03-07 13:59:15 +01:00
CMakeLists.txt	CMake Cleanup: empty endif	2013-03-06 10:14:15 +01:00
Messages.sh	Remove temporary file	2008-07-02 07:04:51 +00:00