l10n daemon script bae370462c 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"		2016-06-25 03:22:57 +00:00
..
active-documentviewer_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-18 04:45:59 +00:00
CMakeLists.txt	Font selector for TextDocumentGenerator	2013-05-18 16:03:33 +02:00
converter.cpp	Fixlets to the txt backend	2013-02-19 00:26:09 +01:00
converter.h	Fixlets to the txt backend	2013-02-19 00:26:09 +01:00
document.cpp	Drop detectEncoding method and just feed more data to KEncodingProber	2013-02-28 23:58:17 +01:00
document.h	Drop detectEncoding method and just feed more data to KEncodingProber	2013-02-28 23:58:17 +01:00
generator_txt.cpp	Removed TextDocumentGenerator::generalSettingsWidget()	2013-06-07 00:44:56 +02:00
generator_txt.h	Font selector for TextDocumentGenerator	2013-05-18 16:03:33 +02:00
libokularGenerator_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-18 04:45:59 +00:00
Messages.sh	Some i18n fixes	2013-05-19 10:59:43 +03:00
okularApplication_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-25 03:22:57 +00:00
okularTxt.desktop	SVN_SILENT made messages (.desktop file)	2014-12-26 04:18:45 +00:00