Skip to content
Commit e4c7dc27 authored by Stephane Mankowski's avatar Stephane Mankowski
Browse files

Merge branch 'master' of kde:skrooge into kf5 

Conflicts:
	skgbasegui/skgcalculatoredit.cpp
	skgbasemodeler/skgservices.cpp
parents 4f9aebc3 7bebee2c
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