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 866dfb4e89 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
..
CMakeLists.txt
flipswitch.cpp
flipswitch.h
flipswitch.kcfg
flipswitch_config.cpp
flipswitch_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
flipswitch_config.h
flipswitch_config.ui
flipswitchconfig.kcfgc