Skip to content
Commit 2a7c45b0 authored by m.eik michalke's avatar m.eik michalke
Browse files

Merge branch 'master' of git.kde.org:rkward 

Conflicts:
	packages/rkwarddev/ChangeLog
parents 1b1512a2 67cbb201
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment