Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2025-09-10 16:47:54 +02:00
Code Releases Activity
6,138 Commits 35 Branches 69 Tags 78 MiB
work/carl/fix-compilation
Commit Graph

54 Commits

Author SHA1 Message Date
l10n daemon script
e88f022bb7 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-02 05:23:51 +01:00
David Rosca
86d3ebebc7
Add new Falkon icon 2018-02-23 12:58:04 +01:00
l10n daemon script
7b0d1abdc9 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-01-25 05:05:01 +01:00
David Rosca
d1502ba68e Use lowercase f in reverse domain name 2018-01-24 11:56:25 +01:00