l10n daemon script fe27d39b5c 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-17 05:41:38 +02:00
..
CMakeLists.txt
main.qml
presentwindows.cpp
presentwindows.h
presentwindows.kcfg
presentwindows_config.cpp
presentwindows_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-17 05:41:38 +02:00
presentwindows_config.h
presentwindows_config.ui
presentwindows_proxy.cpp
presentwindows_proxy.h
presentwindowsconfig.kcfgc