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 ec764e32b6 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"
8 years ago
..
desktopchangeosd
enforcedeco SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
minimizeall SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
synchronizeskipswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
videowall SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
CMakeLists.txt
Messages.sh