David Faure 6a01732860 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks ... Conflicts: CMakeLists.txt [version number] kdecore/tests/kcharsetstest.cpp [deleted]		2012-01-13 11:29:36 +01:00
..
plasma.protocol	SVN_SILENT made messages (.desktop file)	2012-01-07 09:21:08 +01:00