From: Niki Roo Date: Mon, 11 May 2020 22:10:12 +0000 (+0200) Subject: Merge commit '5f3671e17febc5b7f6abbfc62c66c4045d47ec8d' X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=c7815cfa99db7838805561d7b64813f1ab01c76c;p=fanfix-swing.git Merge commit '5f3671e17febc5b7f6abbfc62c66c4045d47ec8d' --- c7815cfa99db7838805561d7b64813f1ab01c76c diff --cc src/be/nikiroo/fanfix/VERSION index ef538c28,00000000..47ae1f78 mode 100644,000000..100644 --- a/src/be/nikiroo/fanfix/VERSION +++ b/src/be/nikiroo/fanfix/VERSION @@@ -1,1 -1,0 +1,1 @@@ - 3.1.2 ++3.1.2-dev diff --cc src/be/nikiroo/fanfix/data/JsonIO.java index 00000000,db81db65..db81db65 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/data/JsonIO.java +++ b/src/be/nikiroo/fanfix/data/JsonIO.java diff --cc src/be/nikiroo/fanfix/library/WebLibrary.java index 00000000,369eb234..369eb234 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/WebLibrary.java +++ b/src/be/nikiroo/fanfix/library/WebLibrary.java diff --cc src/be/nikiroo/fanfix/library/WebLibraryServer.java index 00000000,e0096fcc..e0096fcc mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/WebLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/WebLibraryServer.java diff --cc src/be/nikiroo/fanfix/library/web/WebLibraryServerIndex.java index 00000000,15c371ba..15c371ba mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/WebLibraryServerIndex.java +++ b/src/be/nikiroo/fanfix/library/web/WebLibraryServerIndex.java diff --cc src/be/nikiroo/fanfix/library/web/actual_size-32x32.png index 00000000,0d356b7b..0d356b7b mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/actual_size-64x64.png index 00000000,474afdab..474afdab mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/arrow_double_left-32x32.png index 00000000,e163b601..e163b601 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/arrow_double_left-64x64.png index 00000000,e66dd935..e66dd935 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/arrow_double_right-32x32.png index 00000000,297dcab5..297dcab5 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/arrow_double_right-64x64.png index 00000000,52226f63..52226f63 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/arrow_left-32x32.png index 00000000,af83425c..af83425c mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/arrow_left-64x64.png index 00000000,44cba9cb..44cba9cb mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/arrow_right-32x32.png index 00000000,2540b624..2540b624 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/arrow_right-64x64.png index 00000000,ab960b3e..ab960b3e mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/avicon.ico index 00000000,e69de29b..e69de29b mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/avicon.ico +++ b/src/be/nikiroo/fanfix/library/web/avicon.ico diff --cc src/be/nikiroo/fanfix/library/web/back-32x32.png index 00000000,46c19dc9..46c19dc9 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/back-64x64.png index 00000000,d58d004c..d58d004c mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/favicon.ico index 00000000,feedaf08..feedaf08 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/fit_to_height-32x32.png index 00000000,727dec2d..727dec2d mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/fit_to_height-64x64.png index 00000000,cec7da45..cec7da45 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/fit_to_width-32x32.png index 00000000,ee90843f..ee90843f mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/fit_to_width-64x64.png index 00000000,7b897d26..7b897d26 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/icon_alternative.png index 00000000,4ab09577..4ab09577 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/icon_default.png index 00000000,983b3440..983b3440 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/icon_magic_book.png index 00000000,1798dd32..1798dd32 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/icon_pony_book.png index 00000000,fb6fe0d3..fb6fe0d3 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/icon_pony_library.png index 00000000,a56a4d29..a56a4d29 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/index.post.html index 00000000,d4e09056..d4e09056 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/index.post.html +++ b/src/be/nikiroo/fanfix/library/web/index.post.html diff --cc src/be/nikiroo/fanfix/library/web/index.pre.html index 00000000,18c1508b..18c1508b mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/index.pre.html +++ b/src/be/nikiroo/fanfix/library/web/index.pre.html diff --cc src/be/nikiroo/fanfix/library/web/search-32x32.png index 00000000,92b716d7..92b716d7 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/search-64x64.png index 00000000,93dbf6d9..93dbf6d9 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/style.css index 00000000,c520d78f..c520d78f mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/style.css +++ b/src/be/nikiroo/fanfix/library/web/style.css diff --cc src/be/nikiroo/fanfix/library/web/unknown-32x32.png index 00000000,d2315d1d..d2315d1d mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/unknown-64x64.png index 00000000,261889d7..261889d7 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/reader/TextOutput.java index 00000000,60b3a7f7..60b3a7f7 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/reader/TextOutput.java +++ b/src/be/nikiroo/fanfix/reader/TextOutput.java