l10n daemon script a3c7eac1b8 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"		2015-05-14 10:21:14 +00:00
..
CMakeLists.txt
kwinscreenedges.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-14 10:21:14 +00:00
main.cpp	[kcmkwin/screenedges] Drop check whether Compositing is enabled	2014-12-10 13:49:07 +01:00
main.h
main.ui
Messages.sh
monitor.cpp
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h