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 a1c0d43deb 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"
4 years ago
..
shaders
CMakeLists.txt
coverswitch.cpp
coverswitch.h
coverswitch.kcfg
coverswitch_config.cpp
coverswitch_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
coverswitch_config.h
coverswitch_config.ui
coverswitchconfig.kcfgc