Merge branch 'master' into frameworks

Browse Source

Conflicts:
	CMakeLists.txt
	dnssd/CMakeLists.txt
	kdecore/CMakeLists.txt
	kdecore/auth/ConfigureChecks.cmake
	kdecore/compression/ConfigureChecks.cmake
	kdeui/tests/proxymodeltestsuite/CMakeLists.txt
	kimgio/CMakeLists.txt
	kioslave/http/CMakeLists.txt
	kioslave/http/http.cpp
	kjs/CMakeLists.txt
	mimetypes/CMakeLists.txt
	plasma/popupapplet.cpp
	plasma/private/dialogshadows.cpp
	plasma/tooltipmanager.cpp
	solid/solid/CMakeLists.txt
	sonnet/plugins/CMakeLists.txt

...

This commit is contained in:

Christophe Giboudeaux 2012-12-31 15:39:47 +01:00

parent 72b848ede7 8db20e64c7

commit 6a3903262c

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