l10n daemon script 26ca314687 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 06:02:34 +01:00
..
CMakeLists.txt	[kcmkwin/desktop] Fix activating the desktop effects	2014-05-26 19:25:23 +02:00
desktop.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 06:02:34 +01:00
desktopnameswidget.cpp
desktopnameswidget.h
main.cpp
main.h
main.ui
Messages.sh