l10n daemon script f1bbe935d3 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"		2019-08-07 05:12:10 +02:00
..
desktopchangeosd	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
minimizeall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-17 05:37:27 +01:00
synchronizeskipswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-04 05:20:12 +02:00
videowall	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 05:23:00 +02:00
CMakeLists.txt	Install KPackages with kpackage_install_package	2019-07-16 14:21:14 +02:00
Messages.sh	Extract messages from scripts and scripting module	2013-03-04 10:29:25 +01:00