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
..
data	AutoScroll: Draw scroll indicator inside white circle	2017-01-27 11:05:25 +01:00
autoscroll.qrc	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
autoscroller.cpp	AutoScroll: Don't force detected scroll direction	2017-12-03 19:11:09 +01:00
autoscroller.h	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
autoscrollplugin.cpp	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +01:00
autoscrollplugin.h	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +01:00
autoscrollsettings.cpp	Fix build against Qt 5.11	2018-01-26 12:59:03 +01:00
autoscrollsettings.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
autoscrollsettings.ui	AutoScroll: Add HighDPI pixmaps	2017-01-21 20:23:42 +01:00
CMakeLists.txt	gettext translations: extract them and use ECM to load them	2018-02-25 00:27:41 +01:00
framescroller.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
framescroller.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
Messages.sh	gettext translations: extract them and use ECM to load them	2018-02-25 00:27:41 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-02 07:39:45 +02:00