l10n daemon script b4c58238f3 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-10-05 05:09:06 +02:00

..

bugreport

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

2017-10-05 05:09:06 +02:00

compactrepresentation

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

2017-08-11 04:56:36 +02:00

conditionalloader

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

2017-08-11 04:56:36 +02:00

config

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

2017-08-11 04:56:36 +02:00

dataenginemodel

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

2017-08-11 04:56:36 +02:00

helloworld

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

2017-08-11 04:56:36 +02:00

notes

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

2017-08-11 04:56:36 +02:00

nowplaying

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

2017-08-11 04:56:36 +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

2017-08-11 04:56:36 +02:00

samegame

remove extra executable bits

2017-09-23 19:27:37 +02:00

testcomponents

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

2017-08-11 04:56:36 +02:00

testshaders

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

2017-08-11 04:56:36 +02:00

testtheme

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

2017-08-11 04:56:36 +02:00

widgetgallery

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

2017-08-11 04:56:36 +02:00

windowthumbnails

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

2017-08-11 04:56:36 +02:00

CMakeLists.txt

New bugreport Plasmoid

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