l10n daemon script 73940eff3b 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-08 05:07:42 +01:00

..

package

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

2018-02-08 05:07:42 +01:00

CMakeLists.txt

rename plasmoid directories to packages

2017-07-28 09:34:51 +03:00

LICENSE

include audoban separator in our source code

2017-05-25 00:37:00 +03:00

Messages.sh

use kde translations infrastructure

2017-09-08 12:02:52 +03:00

metadata.desktop.cmake

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

2018-02-08 05:07:42 +01:00

separator.png

include audoban separator in our source code

2017-05-25 00:37:00 +03:00