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

2015-08-10 10:12:53 +00:00

..

applets

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

2015-08-10 10:12:53 +00:00

containments

SVN_SILENT made messages (.desktop file)

2015-02-04 08:58:49 +00:00

dataengines

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

2015-03-19 09:50:52 +00:00

kpart

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

2015-03-19 09:50:52 +00:00

testcontainmentactionsplugin

SVN_SILENT made messages (.desktop file)

2015-02-04 08:58:49 +00:00

wallpapers

SVN_SILENT made messages (.desktop file)

2015-01-02 09:15:04 +00:00

CMakeLists.txt

Use ${KF5_DEP_VERSION} for dependencies in examples/

2014-06-01 11:32:59 +01:00

TODO

Port DataEngineTracker example,

2013-09-04 20:12:21 +05:30