plasma-framework/src/desktoptheme
l10n daemon script 2ec0a35fc1 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"
2021-07-19 01:14:02 +00:00
..
air fix graphics of tooltips 2021-06-14 08:58:40 +00:00
breeze SVN_SILENT made messages (.desktop file) - always resolve ours 2021-06-28 01:23:35 +00:00
breeze-dark SVN_SILENT made messages (.desktop file) - always resolve ours 2021-07-19 01:14:02 +00:00
breeze-light SVN_SILENT made messages (.desktop file) - always resolve ours 2021-06-28 01:23:35 +00:00
oxygen Replace KF5_VERSION with KF_VERSION 2021-01-29 23:25:42 +01:00
CMakeLists.txt Use Find7z & Findgzip from ECM 2021-07-18 15:15:27 +00:00