tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2106 commits 81 branches 117 tags 12 MiB
Commit graph

3 commits

Author SHA1 Message Date
l10n daemon script
39c8603e54 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-11-05 05:36:20 +01:00
l10n daemon script
8d831d018b 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-11-04 06:02:51 +01:00
Nicolas Fella
e66817928f Actually include desktop file 2018-11-02 03:22:05 +01:00