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
..
data	Brute crush all pngs	2016-05-12 12:47:46 -06:00
CMakeLists.txt	Fix installing and loading plugins	2017-10-27 14:14:40 +02:00
gnomekeyringpasswordbackend.cpp	Continue with Falkon renaming	2017-08-25 17:55:52 +02:00
gnomekeyringpasswordbackend.h	Fix building GnomeKeyring and KWallet password backend plugins	2017-09-26 15:19:55 +02:00
gnomekeyringpasswords.qrc	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
gnomekeyringplugin.cpp	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
gnomekeyringplugin.h	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