l10n daemon script 8ffd2f20df 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-02-13 05:51:49 +01:00
..
AutoScroll	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-27 05:34:59 +01:00
FlashCookieManager	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-27 05:34:59 +01:00
GnomeKeyringPasswords	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-13 05:51:49 +01:00
GreaseMonkey	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-27 05:34:59 +01:00
KDEFrameworksIntegration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-27 05:34:59 +01:00
MouseGestures	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-21 05:18:24 +01:00
PIM	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-09 05:37:42 +01:00
PyFalkon	PyFalkon: Fix generating bindings for signals	2019-01-26 16:12:53 +01:00
StatusBarIcons	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-27 05:34:59 +01:00
TabManager	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-27 05:34:59 +01:00
TestPlugin	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-27 05:34:59 +01:00
VerticalTabs	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-27 05:34:59 +01:00
CMakeLists.txt	Rename KDESupport -> KDEFrameworksIntegration plugin	2018-03-31 16:55:50 +02:00