mirror-kde-plasma-desktop/toolboxes
l10n daemon script 4b69268612 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"
2023-09-25 02:07:54 +00:00
..
desktoptoolbox SVN_SILENT made messages (.desktop file) - always resolve ours 2023-09-19 02:14:36 +00:00
paneltoolbox SVN_SILENT made messages (.desktop file) - always resolve ours 2023-09-19 02:14:36 +00:00
CMakeLists.txt Adapt to changes in plasma-framework 2014-04-27 17:29:43 +02:00
plasma-toolbox-paneltoolbox.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2023-09-25 02:07:54 +00:00