l10n daemon script 7faf9e2e8d 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-12-21 04:50:47 +01:00
..
appdata	GIT_SILENT made messages (after extraction)	2017-12-21 03:18:07 +01:00
applications	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-21 04:50:47 +01:00
completion	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
hicolor	CMake buildsystem for src/main as well.	2017-09-10 13:35:21 +02:00
pixmaps	Brute crush all pngs	2016-05-12 12:47:46 -06:00