l10n daemon script bb7051dd3a 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"		2019-10-18 05:38:34 +02:00
..
CMakeLists.txt
flipswitch.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
flipswitch.h	Use more traditional doxygen style	2019-07-29 22:06:19 +03:00
flipswitch.kcfg
flipswitch_config.cpp
flipswitch_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-18 05:38:34 +02:00
flipswitch_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
flipswitch_config.ui
flipswitchconfig.kcfgc