From: Niki Roo Date: Tue, 5 May 2020 18:47:12 +0000 (+0200) Subject: Merge commit '9a553563269f93bae59cf45e43933c81fdec07e8' X-Git-Tag: fanfix-swing-1.2.0~5 X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=b756fcaa14439341852ada71e4ae5a221d3289ca;p=fanfix-swing.git Merge commit '9a553563269f93bae59cf45e43933c81fdec07e8' --- b756fcaa14439341852ada71e4ae5a221d3289ca diff --cc src/be/nikiroo/fanfix/test/BasicSupportDeprecatedTest.java index 00000000,c8c4b401..c8c4b401 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/BasicSupportDeprecatedTest.java +++ b/src/be/nikiroo/fanfix/test/BasicSupportDeprecatedTest.java diff --cc src/be/nikiroo/fanfix/test/BasicSupportUtilitiesTest.java index 00000000,9cec2208..9cec2208 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/BasicSupportUtilitiesTest.java +++ b/src/be/nikiroo/fanfix/test/BasicSupportUtilitiesTest.java diff --cc src/be/nikiroo/fanfix/test/ConversionTest.java index 00000000,2b22364d..2b22364d mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/ConversionTest.java +++ b/src/be/nikiroo/fanfix/test/ConversionTest.java diff --cc src/be/nikiroo/fanfix/test/LibraryTest.java index 00000000,da44438d..da44438d mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/LibraryTest.java +++ b/src/be/nikiroo/fanfix/test/LibraryTest.java diff --cc src/be/nikiroo/fanfix/test/Test.java index 00000000,5ec24a43..5ec24a43 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/Test.java +++ b/src/be/nikiroo/fanfix/test/Test.java diff --cc src/be/nikiroo/fanfix/test/expected_test.story/cbz.cbz index 00000000,28cc25b1..28cc25b1 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/test/expected_test.story/epub.epub index 00000000,776d05de..776d05de mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/test/expected_test.story/html/html.info index 00000000,506e477f..506e477f mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/expected_test.story/html/html.info +++ b/src/be/nikiroo/fanfix/test/expected_test.story/html/html.info diff --cc src/be/nikiroo/fanfix/test/expected_test.story/html/html.txt index 00000000,a3a3af31..a3a3af31 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/expected_test.story/html/html.txt +++ b/src/be/nikiroo/fanfix/test/expected_test.story/html/html.txt diff --cc src/be/nikiroo/fanfix/test/expected_test.story/html/index.html index 00000000,aade9c3f..aade9c3f mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/expected_test.story/html/index.html +++ b/src/be/nikiroo/fanfix/test/expected_test.story/html/index.html diff --cc src/be/nikiroo/fanfix/test/expected_test.story/html/style.css index 00000000,6b6d0d20..6b6d0d20 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/expected_test.story/html/style.css +++ b/src/be/nikiroo/fanfix/test/expected_test.story/html/style.css diff --cc src/be/nikiroo/fanfix/test/expected_test.story/info_text index 00000000,768b3ccb..768b3ccb mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/expected_test.story/info_text +++ b/src/be/nikiroo/fanfix/test/expected_test.story/info_text diff --cc src/be/nikiroo/fanfix/test/expected_test.story/info_text.info index 00000000,cc522dd3..cc522dd3 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/expected_test.story/info_text.info +++ b/src/be/nikiroo/fanfix/test/expected_test.story/info_text.info diff --cc src/be/nikiroo/fanfix/test/expected_test.story/latex.tex index 00000000,d4dd68f1..d4dd68f1 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/expected_test.story/latex.tex +++ b/src/be/nikiroo/fanfix/test/expected_test.story/latex.tex diff --cc src/be/nikiroo/fanfix/test/expected_test.story/text.txt index 00000000,a3a3af31..a3a3af31 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/expected_test.story/text.txt +++ b/src/be/nikiroo/fanfix/test/expected_test.story/text.txt diff --cc src/be/nikiroo/fanfix/test/test.story index 00000000,7365b607..7365b607 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/test/test.story +++ b/src/be/nikiroo/fanfix/test/test.story