From: Niki Roo <niki@nikiroo.be>
Date: Sat, 13 Apr 2019 06:29:50 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=cebf0288417d0d556ecc2d9bf73a500efe5b6470;hp=53f76130c5337a77362b191f22115b461811ba36

Merge branch 'master' into search
---

diff --git a/changelog-fr.md b/changelog-fr.md
index efe992f..58aa0ed 100644
--- a/changelog-fr.md
+++ b/changelog-fr.md
@@ -1,5 +1,12 @@
 # Fanfix
 
+# Version WIP
+
+- new: recherche d'histoires (Fanfiction.net)
+- new: support d'un proxy
+- fix: support des CBZ contenant du texte
+- gui: correction pour le focus 
+
 # Version 2.0.2
 
 - i18n: changer la langue dans les options fonctionne aussi quand $LANG existe
diff --git a/changelog.md b/changelog.md
index 6a72565..c54cc00 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,12 @@
 # Fanfix
 
+# Version WIP
+
+- new: story search (Fanfiction.net)
+- new: proxy support
+- fix: support hybrid CBZ (with text)
+- gui: focus fix
+
 # Version 2.0.2
 
 - i18n: setting the language in the option panel now works even with $LANG set
diff --git a/libs/nikiroo-utils-4.6.0-sources.jar b/libs/nikiroo-utils-4.6.2-sources.jar
similarity index 95%
rename from libs/nikiroo-utils-4.6.0-sources.jar
rename to libs/nikiroo-utils-4.6.2-sources.jar
index e5d8d44..0df1d7c 100644
Binary files a/libs/nikiroo-utils-4.6.0-sources.jar and b/libs/nikiroo-utils-4.6.2-sources.jar differ