l10n daemon script ba0b34c755 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"		2018-11-22 06:02:11 +01:00
..
CMakeLists.txt	[kcmkwin/kwindesktop] Use PackageLoader to get effect metadata	2018-07-06 17:15:23 +03:00
desktop.desktop
desktopnameswidget.cpp
desktopnameswidget.h
main.cpp
main.h
main.ui
Messages.sh