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

List:       kde-commits
Subject:    [kde-workspace] /: Merge remote-tracking branch 'origin/KDE/4.9'
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2012-11-30 21:09:42
Message-ID: 20121130210942.07DFCA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 5a97ab43b0e6cc35ee60e5cf63aba63c77ecb5d5 by Albert Astals Cid.
Committed on 30/11/2012 at 22:09.
Pushed by aacid into branch 'master'.

Merge remote-tracking branch 'origin/KDE/4.9'

In krunner/interfaces/default/interface.cpp kept the code from master as in=
structed by aseigo

Conflicts:
	CMakeLists.txt
	kcontrol/autostart/autostart.desktop
	kcontrol/screensaver/screensaver.desktop
	kwin/kwin.notifyrc
	powerdevil/powerdevil.notifyrc
	solid/solid-actions-kcm/device-actions/solid-device-AcAdapter.desktop
	solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop
	solid/solid-actions-kcm/solid-actions.desktop


http://commits.kde.org/kde-workspace/5a97ab43b0e6cc35ee60e5cf63aba63c77ecb5=
d5
[prev in list] [next in list] [prev in thread] [next in thread]