l10n daemon script 4809dfacaa 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-01 05:43:21 +02:00
..
data	Added GreaseMonkey + PIM plugins	2012-07-11 18:30:00 +02:00
CMakeLists.txt	gettext translations: extract them and use ECM to load them	2018-02-25 00:27:41 +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-01 05:43:21 +02:00
PIM_handler.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
PIM_handler.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
PIM_plugin.cpp	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +01:00
PIM_plugin.h	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +01:00
PIM_res.qrc	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
PIM_settings.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
PIM_settings.h	Replace signals/slots with Q_SIGNALS/Q_SLOTS	2018-02-25 13:33:07 +01:00
PIM_settings.ui	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
test.html	Added GreaseMonkey + PIM plugins	2012-07-11 18:30:00 +02:00