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

Browse Source

Conflicts:
	knotes/data/knote_config_collection.desktop

wilder-work

Montel Laurent 12 years ago

parent 4d71b43803 eb9f654a4c

commit df7c876013

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available