From: Niki Roo <niki@nikiroo.be>
Date: Thu, 7 May 2020 20:28:23 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=844d50dbf3ceb3480b0effc9085752de503856aa;p=nikiroo-utils.git

Merge branch 'subtree'
---

844d50dbf3ceb3480b0effc9085752de503856aa
diff --cc src/be/nikiroo/utils/VersionCheck.java
index 0000000,0e16c2b..0e16c2b
mode 000000,100644..100644
--- a/src/be/nikiroo/utils/VersionCheck.java
+++ b/src/be/nikiroo/utils/VersionCheck.java
diff --cc src/be/nikiroo/utils/ui/ZoomBox.java
index 0000000,a8f9609..a8f9609
mode 000000,100644..100644
--- a/src/be/nikiroo/utils/ui/ZoomBox.java
+++ b/src/be/nikiroo/utils/ui/ZoomBox.java