l10n daemon script 16ccd123dd 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"		2020-06-25 05:50:13 +02:00
..
CMakeLists.txt	more improvements to containmentactions	2018-02-03 21:56:05 +02:00
menu.cpp	REFACTOR:split up and refactor liblatte2 and types	2020-04-18 13:39:45 +03:00
menu.h	add quit application to contextmenu actions	2020-03-05 20:09:22 +02:00
Messages.sh	add containmentactions	2018-02-03 20:56:30 +02:00
plasma-containmentactions-lattecontextmenu.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-25 05:50:13 +02:00