l10n daemon script 277003fa1d 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-05-16 07:34:51 +02:00
..
appdata	GIT_SILENT made messages (after extraction)	2018-04-27 06:14:01 +02:00
applications	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-16 07:34:51 +02: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
build-appimage.sh	Update build-appimage.sh	2018-02-28 22:03:18 +01:00