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

2019-07-31 05:13:30 +02:00

..

CMakeLists.txt

Automatically set version of desktopthemes packages to KF5_VERSION

2019-06-13 15:38:23 +02:00

colors

Make Breeze Light/Dark use more system colors

2019-05-29 20:46:08 -04:00

metadata.desktop.cmake

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

2019-07-31 05:13:30 +02:00