l10n daemon script 00f337b82c 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-18 04:59:49 +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
imagefinder.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
imagefinder.h	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
imagefinder.qrc	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
imagefinderplugin.cpp	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
imagefinderplugin.h	Fix missing override warnings	2018-02-11 20:36:06 +01:00
imagefindersettings.cpp	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
imagefindersettings.h	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
imagefindersettings.ui	Feature: ImageFinder plugin	2016-01-17 01:13:00 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-18 04:59:49 +01:00