l10n daemon script bdf1845342 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"		2018-02-12 07:04:02 +01:00
..
CMakeLists.txt
flipswitch.cpp
flipswitch.h	Fix build with a KWindowSystem framework that doesn't pull QWidget	2017-11-17 17:30:58 +01:00
flipswitch.kcfg
flipswitch_config.cpp
flipswitch_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-12 07:04:02 +01:00
flipswitch_config.h
flipswitch_config.ui
flipswitchconfig.kcfgc