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

..

bugreport

Use more https in links (& update a few urls)

2019-01-19 16:36:59 +01:00

compactrepresentation

Remove unused X-Plasma-RemoteLocation entries

2018-03-24 01:02:05 +01:00

conditionalloader

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

2018-10-10 06:27:59 +02:00

config

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

2018-10-10 06:27:59 +02:00

dataenginemodel

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

2019-02-22 05:35:03 +01:00

helloworld

Remove unused X-Plasma-RemoteLocation entries

2018-03-24 01:02:05 +01:00

notes

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

2018-10-10 06:27:59 +02:00

nowplaying

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

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

pairsgame/contents/ui

add 3 example plasmoids to be ported

2013-09-04 11:57:46 +02:00

qmltasks

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

2019-07-24 05:33:26 +02:00

samegame

Use more https in links (& update a few urls)

2019-01-19 16:36:59 +01:00

testcomponents

Use more https in links (& update a few urls)

2019-01-19 16:36:59 +01:00

testshaders

Remove long-time deprecated Encoding=UTF-8 from example desktop files

2018-03-10 02:18:22 +01:00

testtheme

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

2018-10-10 06:27:59 +02:00

widgetgallery

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

2019-07-24 05:33:26 +02:00

windowthumbnails

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

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

CMakeLists.txt

New bugreport Plasmoid

2014-02-22 02:09:23 +01:00