Skip to content
Commit 0e5cecec authored by Hrvoje Senjan's avatar Hrvoje Senjan
Browse files

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

Conflicts:
	applets/bubblemon/plasma-applet-bubblemon.desktop
	applets/paste/pastemacroexpander.cpp
parents 278a2f34 ff3fa2d0
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