l10n daemon script b160c5babb 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"		2017-03-25 04:37:53 +01:00
..
CMakeLists.txt
kwinscreenedges.desktop
main.cpp
main.h
main.ui
Messages.sh
monitor.cpp
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h