Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
0356908fc8 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-06 04:42:32 +02:00
Albert Vaca
e6248c0d1b Initial mousepad (remote input) plugin implementation for windows 2017-06-29 01:57:46 +02:00