Merge branch 'KDE/4.10'

Browse Source

Conflicts:
	nepomuk/kcm/kcm_nepomuk.desktop

...

This commit is contained in:

Marco Martin 2012-12-24 11:57:26 +01:00

parent 31fdd51401 fd00bbdafa

commit 447acb04fb

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