l10n daemon script adf24d7f94 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-02-14 04:57:58 +01:00
..
data	Added GreaseMonkey + PIM plugins	2012-07-11 18:30:00 +02:00
CMakeLists.txt	Fix installing and loading plugins	2017-10-27 14:14:40 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-14 04:57:58 +01:00
PIM_handler.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
PIM_handler.h	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
PIM_plugin.cpp	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
PIM_plugin.h	Fix missing override warnings	2018-02-11 20:36:06 +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	Initial rename to Falkon	2017-08-25 17:32:32 +02: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