kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-24 17:33:50 +03:00
Code Issues Projects Releases Wiki Activity
1,881 Commits 15 Branches 48 Tags 22 MiB
211399eaf5
Commit Graph

5 Commits

Author SHA1 Message Date
l10n daemon script
86aac1fa4b 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-02-13 05:13:52 +01:00
l10n daemon script
87c0b5b319 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-02-12 05:13:16 +01:00
l10n daemon script
aa3a9b2411 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-02-06 05:12:53 +01:00
l10n daemon script
e6f275939a 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-02-05 05:07:21 +01:00
Michail Vourlakos
d3756e0ce1 add containmentactions 2018-02-03 20:56:30 +02:00