l10n daemon script b4eaa10c10 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-19 05:02:21 +01:00
..
CMakeLists.txt	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-19 05:02:21 +01:00
testplugin_sidebar.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
testplugin_sidebar.h	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
testplugin.cpp	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
testplugin.h	Fix missing override warnings	2018-02-11 20:36:06 +01:00
testplugin.qrc	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00