l10n daemon script 68f1a87c67 SVN_SILENT made messages (.desktop file) - always resolve ours ...

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

2017-01-28 06:33:42 +01:00

..

declarativeimports

[PlasmaComponents Menu] Add maximumWidth property

2017-01-25 18:02:33 +01:00

desktoptheme

KAlarm icon is indistinct and unrecognisable at smaller sizes

2017-01-24 21:13:44 +01:00

plasma

it must also be possible for the status to be decreased again

2017-01-19 14:30:13 +01:00

plasmapkg

search/replace old hardcoded types from plasmapkg2

2017-01-03 13:25:02 +01:00

plasmaquick

Dialog: Hide when focus changes to ConfigView with hideOnWindowDeactivate

2017-01-26 15:25:14 +01:00

scriptengines

SVN_SILENT made messages (.desktop file) - always resolve ours

2017-01-28 06:33:42 +01:00

tools

fix stylesheet

2015-12-07 10:40:34 +01:00

CMakeLists.txt

remove kpart related code

2016-05-19 17:47:09 +02:00

Messages.sh

Consolidate all plasma-framework catalogs

2014-04-25 10:40:12 +02:00