You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 71acd12eb2 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"
6 years ago
..
desktopchangeosd [desktopchangeosd] Sync desktop switch OSD font size to Plasma OSD font size 6 years ago
enforcedeco SVN_SILENT made messages (.desktop file) - always resolve ours 6 years ago
minimizeall SVN_SILENT made messages (.desktop file) - always resolve ours 6 years ago
synchronizeskipswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 6 years ago
videowall
CMakeLists.txt
Messages.sh