1
0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13:33:50 +03:00
latte-dock/containment
l10n daemon script a3e747188f 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"
2019-11-04 05:13:17 +01:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-04 05:13:17 +01:00
CMakeLists.txt fix #453,substitute absolute build path references 2017-05-10 18:03:31 +03:00
Messages.sh use kde translations infrastructure 2017-09-08 12:02:52 +03:00
metadata.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-04 05:13:17 +01:00