l10n daemon script e8d79632bd 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"		6 years ago
..
CMakeLists.txt	more improvements to containmentactions	7 years ago
Messages.sh	add containmentactions	7 years ago
menu.cpp	Improve Contextmenu	6 years ago
menu.h	support to send the viewType through dbus	6 years ago
plasma-containmentactions-lattecontextmenu.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	6 years ago