1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-01 01:17:51 +03:00
latte-dock/containmentactions
l10n daemon script bc72c8598d 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-03-03 05:30:12 +01:00
..
contextmenu SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-03 05:30:12 +01:00
CMakeLists.txt add containmentactions 2018-02-03 20:56:30 +02:00