andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity
677 Commits 6 Branches 30 Tags 2.7 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
l10n daemon script fe117a20b0 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-03-03 05:26:15 +01:00
Andrius Štikonas 144e260efe Finish porting to KCoreAddons JSON plugins. 
Convert .desktop files to .json with desktoptojson
 2018-03-02 11:33:46 +00:00