l10n daemon script 0990566c63 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"		2016-05-31 11:06:54 +00:00
..
CMakeLists.txt	[kcmscreenedges] Call reconfigureEffect on save	2014-05-16 07:38:01 +02:00
kwinscreenedges.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
main.cpp	Add KRunner and Activity Manager screen edge	2016-05-08 16:53:48 +02:00
main.h
main.ui
Messages.sh
monitor.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h