Merge branch 'master' of git.kde.org:simon
author Peter Grasch
()
committer Peter Grasch
()
commit 53e558ac3de4fcc2afa7e279679e226d17894610
tree fd983318f5a071e7221e8f3686d2cc2ea74a7cba
parent d8b19bac80ffc37a3a4d5079d64f457a86558f72
parent a3723a58d287f31bee447fb59d5c4b23f362fc1b
Merge branch 'master' of git.kde.org:simon
simonlib/simoncontextcoreui/compoundconditionsettings.ui