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

Browse source

Ignat, can you check whether everything is correct? The general policy
in kde-baseapps when committing to stable branches is to commit in stable,
then merge to master.

CCMAIL: ignat.semenov@blue-systems.com

Conflicts:
	plasma/applets/folderview/folderview.cpp
	plasma/applets/folderview/folderview.h

...

This commit is contained in:

Luca Beltrame 2013-03-25 14:35:22 +01:00 committed by Luca Beltrame

parent 3b1bc8346f 5fb0a7236b

commit 0dc35cadbe

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available