l10n daemon script 4c7f7cfc2e 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-26 05:08:41 +02:00
..
data	AdBlock: Make it as self-contained as possible	2018-01-11 19:36:32 +01:00
adblock.qrc	AdBlockPlugin: Add proper metadata	2018-02-24 14:11:25 +01:00
adblockaddsubscriptiondialog.cpp	AdBlock: Add NoCoin List as default list with EasyList	2018-02-14 09:14:47 +01:00
adblockaddsubscriptiondialog.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
adblockaddsubscriptiondialog.ui	AdBlock: Support for adding new subscriptions.	2012-06-24 23:46:32 +02:00
adblockdialog.cpp	AdBlockDialog: Change to QDialog	2018-02-09 18:13:25 +01:00
adblockdialog.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
adblockdialog.ui	AdBlockDialog: Change to QDialog	2018-02-09 18:13:25 +01:00
adblockicon.cpp	TabWidget: Add public webTab method	2018-02-05 16:44:23 +01:00
adblockicon.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
adblockmanager.cpp	AdBlock: Add NoCoin List as default list with EasyList	2018-02-14 09:14:47 +01:00
adblockmanager.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
adblockmatcher.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
adblockmatcher.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
adblockplugin.cpp	AdBlockPlugin: Support unloading plugin	2018-02-24 14:16:28 +01:00
adblockplugin.h	AdBlockPlugin: Support unloading plugin	2018-02-24 14:16:28 +01:00
adblockrule.cpp	Remove QzRegExp	2018-02-11 10:54:59 +01:00
adblockrule.h	Remove QzRegExp	2018-02-11 10:54:59 +01:00
adblocksearchtree.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
adblocksearchtree.h	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
adblocksubscription.cpp	AdBlockSubscription: Fix leak when reloading subscription	2018-03-16 21:04:53 +01:00
adblocksubscription.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
adblocktreewidget.cpp	AdBlockTreeWidget: Fix restoring item font and color for normal rules	2017-12-03 19:10:56 +01:00
adblocktreewidget.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
adblockurlinterceptor.cpp	AdBlock: Load blocked page as data url instead of qupzilla:adblock	2018-01-11 19:52:29 +01:00
adblockurlinterceptor.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-26 05:08:41 +02:00