l10n daemon script 24193527bf 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-08-11 04:56:36 +02:00

..

contents/ui

more comment&docs

2014-08-28 16:04:02 +02:00

platformcontents/application/tablet/ui

port to new api

2014-02-04 17:29:28 +01:00

metadata.desktop

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

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

widgetgallery-tablet

add a bunch of test applets that already work

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