l10n daemon script 3dc4685561 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"		2017-09-01 04:37:46 +02:00
..
lib	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-01 04:37:46 +02:00
main	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
plugins	Continue with Falkon renaming	2017-08-25 17:55:52 +02:00
defines.pri	Continue with Falkon renaming	2017-08-25 17:55:52 +02:00
install.pri	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
plugins.pri	Initial rename to Falkon	2017-08-25 17:32:32 +02:00