1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-15 03:22:11 +01:00
falkonOfficial/src/plugins
l10n daemon script f322c4ed94 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-04-04 09:01:22 +02:00
..
AutoScroll SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
FlashCookieManager SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
GnomeKeyringPasswords SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
GreaseMonkey SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
KDEFrameworksIntegration SVN_SILENT made messages (.desktop file) - always resolve ours 2019-04-04 09:01:22 +02:00
MouseGestures SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
PIM SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
PyFalkon PyFalkon: Fix build with Qt 5.12.2 2019-03-25 11:38:27 +01:00
StatusBarIcons SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
TabManager SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
TestPlugin SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
VerticalTabs SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-21 08:45:27 +01:00
CMakeLists.txt Rename KDESupport -> KDEFrameworksIntegration plugin 2018-03-31 16:55:50 +02:00