l10n daemon script e80ebab9db 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"

2018-02-25 05:27:39 +01:00

..

declarativeimports

other preload microoptimizations

2018-02-22 18:42:14 +01:00

desktoptheme

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

2018-02-25 05:27:39 +01:00

plasma

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

2018-02-25 05:27:39 +01:00

plasmapkg

Remove implicit string casting

2017-12-02 15:44:14 +01:00

plasmaquick

[AppletQuickItem] Preload applet expander only if not already expanded

2018-02-23 12:59:41 +01:00

scriptengines

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

2018-02-25 05:27:39 +01:00

tools

fix typo, iterate all colors available

2017-03-24 13:46:12 +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