1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-15 19:42:10 +01:00
falkonOfficial/src/plugins
l10n daemon script f838f02db1 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-03-06 05:24:12 +01:00
..
AutoScroll SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
FlashCookieManager SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
GnomeKeyringPasswords SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
GreaseMonkey SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
KWalletPasswords SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
MouseGestures SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
PIM SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
PyFalkon PyFalkon: Remove WebPage::javaScriptPrompt 2018-03-03 12:57:28 +01:00
StatusBarIcons SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
TabManager SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
TestPlugin SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
VerticalTabs SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:24:12 +01:00
CMakeLists.txt Remove ImageFinder plugin 2018-03-03 12:57:28 +01:00