Oliver Henshaw 47acf4ee9a Merge remote-tracking branch 'origin/KDE/4.10' into master ... Conflicts: kwin/scripting/scripting.cpp powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop		2013-05-28 17:36:53 +01:00
..
aurorae	Merge remote-tracking branch 'origin/KDE/4.10' into master	2013-05-28 17:36:53 +01:00
b2
laptop	SVN_SILENT made messages (.desktop file)	2013-04-26 08:56:47 +02:00
oxygen	SVN_SILENT made messages (.desktop file)	2013-04-26 08:56:47 +02:00
CMakeLists.txt
Messages.sh