l10n daemon script dd60458d6a 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"		2018-04-24 05:25:10 +02:00
..
AutoScroll	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
FlashCookieManager	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
GnomeKeyringPasswords	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
GreaseMonkey	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
KDEFrameworksIntegration	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
MouseGestures	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
PIM	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-24 05:25:10 +02:00
PyFalkon	Add SqlQueryJob to run queries on separate thread	2018-04-11 18:24:09 +02:00
StatusBarIcons	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
TabManager	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
TestPlugin	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
VerticalTabs	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-21 05:30:07 +02:00
CMakeLists.txt	Rename KDESupport -> KDEFrameworksIntegration plugin	2018-03-31 16:55:50 +02:00