l10n daemon script 7689b73daa 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-05-02 07:39:45 +02:00
..
AutoScroll	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
FlashCookieManager	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
GnomeKeyringPasswords	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
GreaseMonkey	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
ImageFinder	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
KWalletPasswords	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
MouseGestures	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
PIM	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
PyFalkon	PyFalkon: Fix build with latest PySide2	2018-05-01 13:07:47 +02:00
StatusBarIcons	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
TabManager	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
TestPlugin	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
VerticalTabs	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00
CMakeLists.txt	Don't install Python extensions when Python support is disabled	2018-02-26 18:28:58 +01:00