From 3d247bc3bb955a9b85686f0db431157cb9dc4a10 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Fri, 17 Feb 2017 13:46:38 +0100 Subject: [PATCH] Fix UTF-8 and "/" -> "\" issues for Win32 It works on Windows now --- VERSION | 2 +- ...es.jar => nikiroo-utils-0.9.8-sources.jar} | Bin 39700 -> 39721 bytes src/be/nikiroo/fanfix/Library.java | 2 +- src/be/nikiroo/fanfix/output/Cbz.java | 10 +++++++--- src/be/nikiroo/fanfix/output/Epub.java | 12 ++++++++---- src/be/nikiroo/fanfix/output/Html.java | 10 ++++++---- src/be/nikiroo/fanfix/output/InfoCover.java | 11 +++++++---- src/be/nikiroo/fanfix/output/LaTeX.java | 11 +++++++---- src/be/nikiroo/fanfix/output/Text.java | 11 +++++++---- src/be/nikiroo/fanfix/reader/LocalReader.java | 18 ++++++++++-------- 10 files changed, 54 insertions(+), 33 deletions(-) rename libs/{nikiroo-utils-0.9.7-sources.jar => nikiroo-utils-0.9.8-sources.jar} (71%) diff --git a/VERSION b/VERSION index a602fc9e..b0bb8785 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.4 +0.9.5 diff --git a/libs/nikiroo-utils-0.9.7-sources.jar b/libs/nikiroo-utils-0.9.8-sources.jar similarity index 71% rename from libs/nikiroo-utils-0.9.7-sources.jar rename to libs/nikiroo-utils-0.9.8-sources.jar index dbccbca122182540b78a387abd863fae900e38b2..3f930a41e0498a9cef074ffc2414e2120d788b81 100644 GIT binary patch delta 4249 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 delta 4138 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 B5