ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
933 Commits 169 Branches 68 Tags
2dd019d72f1e4fbc2d620c33f94e2866760adaea
Commit Graph

4 Commits

Author SHA1 Message Date
l10n daemon script
36a92be7bd 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"
 2020-11-04 06:30:04 +01:00
Tobias Fella
c44e4544ca Add temporary icon 2020-11-03 16:57:28 +01:00
l10n daemon script
e4338a599e 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"
 2020-11-03 06:12:27 +01:00
Tobias Fella
fbc28148a0 Cleanup cmake, metadata 2020-11-02 16:12:33 +00:00