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

Browse Source

Conflicts:
	kdeui/colors/kcolorbutton.cpp [ported to QColorDialog, let's hope it handle double-click...]
	kdeui/xmlgui/kxmlguiclient.cpp
	kio/kio/kprotocolmanager.cpp [reverted...]
	kioslave/file/file_unix.cpp [minor]
	plasma/dialog.cpp [gone -> changes ignored]
	plasma/tooltipmanager.cpp [gone -> changes ignored]

...

This commit is contained in:

David Faure 2012-12-07 16:04:32 +01:00

parent d113473c2d f0ccabbc42

commit eaa9afe7e6

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 Not Available