From: Niki Roo <niki@nikiroo.be>
Date: Mon, 11 May 2020 21:57:44 +0000 (+0200)
Subject: Merge branch 'master' into subtree
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=5f3671e17febc5b7f6abbfc62c66c4045d47ec8d;p=fanfix-swing.git

Merge branch 'master' into subtree
---

5f3671e17febc5b7f6abbfc62c66c4045d47ec8d
diff --cc data/JsonIO.java
index 00000000,db81db65..db81db65
mode 000000,100644..100644
--- a/data/JsonIO.java
+++ b/data/JsonIO.java
diff --cc library/WebLibrary.java
index 00000000,369eb234..369eb234
mode 000000,100644..100644
--- a/library/WebLibrary.java
+++ b/library/WebLibrary.java
diff --cc library/WebLibraryServer.java
index 00000000,e0096fcc..e0096fcc
mode 000000,100644..100644
--- a/library/WebLibraryServer.java
+++ b/library/WebLibraryServer.java
diff --cc library/web/WebLibraryServerIndex.java
index 00000000,15c371ba..15c371ba
mode 000000,100644..100644
--- a/library/web/WebLibraryServerIndex.java
+++ b/library/web/WebLibraryServerIndex.java
diff --cc library/web/actual_size-32x32.png
index 00000000,0d356b7b..0d356b7b
mode 000000,100644..100644
Binary files differ
diff --cc library/web/actual_size-64x64.png
index 00000000,474afdab..474afdab
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_double_left-32x32.png
index 00000000,e163b601..e163b601
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_double_left-64x64.png
index 00000000,e66dd935..e66dd935
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_double_right-32x32.png
index 00000000,297dcab5..297dcab5
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_double_right-64x64.png
index 00000000,52226f63..52226f63
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_left-32x32.png
index 00000000,af83425c..af83425c
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_left-64x64.png
index 00000000,44cba9cb..44cba9cb
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_right-32x32.png
index 00000000,2540b624..2540b624
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_right-64x64.png
index 00000000,ab960b3e..ab960b3e
mode 000000,100644..100644
Binary files differ
diff --cc library/web/avicon.ico
index 00000000,e69de29b..e69de29b
mode 000000,100644..100644
--- a/library/web/avicon.ico
+++ b/library/web/avicon.ico
diff --cc library/web/back-32x32.png
index 00000000,46c19dc9..46c19dc9
mode 000000,100644..100644
Binary files differ
diff --cc library/web/back-64x64.png
index 00000000,d58d004c..d58d004c
mode 000000,100644..100644
Binary files differ
diff --cc library/web/favicon.ico
index 00000000,feedaf08..feedaf08
mode 000000,100644..100644
Binary files differ
diff --cc library/web/fit_to_height-32x32.png
index 00000000,727dec2d..727dec2d
mode 000000,100644..100644
Binary files differ
diff --cc library/web/fit_to_height-64x64.png
index 00000000,cec7da45..cec7da45
mode 000000,100644..100644
Binary files differ
diff --cc library/web/fit_to_width-32x32.png
index 00000000,ee90843f..ee90843f
mode 000000,100644..100644
Binary files differ
diff --cc library/web/fit_to_width-64x64.png
index 00000000,7b897d26..7b897d26
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_alternative.png
index 00000000,4ab09577..4ab09577
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_default.png
index 00000000,983b3440..983b3440
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_magic_book.png
index 00000000,1798dd32..1798dd32
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_pony_book.png
index 00000000,fb6fe0d3..fb6fe0d3
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_pony_library.png
index 00000000,a56a4d29..a56a4d29
mode 000000,100644..100644
Binary files differ
diff --cc library/web/index.post.html
index 00000000,d4e09056..d4e09056
mode 000000,100644..100644
--- a/library/web/index.post.html
+++ b/library/web/index.post.html
diff --cc library/web/index.pre.html
index 00000000,18c1508b..18c1508b
mode 000000,100644..100644
--- a/library/web/index.pre.html
+++ b/library/web/index.pre.html
diff --cc library/web/search-32x32.png
index 00000000,92b716d7..92b716d7
mode 000000,100644..100644
Binary files differ
diff --cc library/web/search-64x64.png
index 00000000,93dbf6d9..93dbf6d9
mode 000000,100644..100644
Binary files differ
diff --cc library/web/style.css
index 00000000,c520d78f..c520d78f
mode 000000,100644..100644
--- a/library/web/style.css
+++ b/library/web/style.css
diff --cc library/web/unknown-32x32.png
index 00000000,d2315d1d..d2315d1d
mode 000000,100644..100644
Binary files differ
diff --cc library/web/unknown-64x64.png
index 00000000,261889d7..261889d7
mode 000000,100644..100644
Binary files differ
diff --cc reader/TextOutput.java
index 00000000,60b3a7f7..60b3a7f7
mode 000000,100644..100644
--- a/reader/TextOutput.java
+++ b/reader/TextOutput.java