l10n daemon script 2897465060 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"		7 years ago
..
CMakeLists.txt	more improvements to containmentactions	7 years ago
Messages.sh	add containmentactions	7 years ago
menu.cpp	Fix minor EBN issues	7 years ago
menu.h	update code to new astyle conditions	7 years ago
plasma-containmentactions-lattecontextmenu.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	7 years ago