l10n daemon script 01b61a9ede 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-03-16 10:12:25 +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	2015-03-16 10:12:25 +00:00
main.cpp	[kcmkwin/screenedges] Drop check whether Compositing is enabled	2014-12-10 13:49:07 +01:00
main.h	[kcmkwin/screenedges] Use BuiltInEffects to find the Desktop Effects	2014-04-28 13:51:30 +02:00
main.ui
Messages.sh
monitor.cpp	Remove KDE/ prefix in include directories	2014-03-17 16:24:10 +01:00
monitor.h
screenpreviewwidget.cpp	[kwin] Mark unused variables as unused	2014-02-03 11:36:21 +01:00
screenpreviewwidget.h