l10n daemon script caf1380774 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"		2019-01-21 05:18:24 +01:00
..
appdata	GIT_SILENT made messages (after extraction)	2019-01-21 03:00:18 +01:00
appimage	AppImage: Bundle KWindowSystem plugins	2018-05-09 18:11:57 +02:00
applications	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-21 05:18:24 +01:00
completion	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
hicolor	Add new Falkon icon	2018-02-23 12:58:04 +01:00
pixmaps	Add new Falkon icon	2018-02-23 12:58:04 +01:00