[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] /: Merge branch 'KDE/4.10'
From:       David Edmundson <kde () davidedmundson ! co ! uk>
Date:       2013-03-31 22:22:11
Message-ID: 20130331222211.A9749A604F () git ! kde ! org
[Download RAW message or body]

Git commit aee85debb06705fcd1e98449ec7b684b21b570b4 by David Edmundson.
Committed on 01/04/2013 at 00:21.
Pushed by davidedmundson into branch 'master'.

Merge branch 'KDE/4.10'

Conflicts:
	CMakeLists.txt
	plasma/generic/applets/batterymonitor/metadata.desktop
	plasma/generic/applets/lock_logout/metadata.desktop
	solid/solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop


http://commits.kde.org/kde-workspace/aee85debb06705fcd1e98449ec7b684b21b570=
b4
[prev in list] [next in list] [prev in thread] [next in thread]