From: Niki Roo <niki@nikiroo.be>
Date: Tue, 5 May 2020 20:39:36 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=26a1f3fe044c616802367e8a0f2cd4f099413ceb;p=nikiroo-utils.git

Merge branch 'subtree'
---

26a1f3fe044c616802367e8a0f2cd4f099413ceb
diff --cc src/be/nikiroo/utils/ui/NavBar.java
index 0000000,e99115c..e99115c
mode 000000,100644..100644
--- a/src/be/nikiroo/utils/ui/NavBar.java
+++ b/src/be/nikiroo/utils/ui/NavBar.java
diff --cc src/be/nikiroo/utils/ui/WaitingDialog.java
index 0000000,0fd4574..0fd4574
mode 000000,100644..100644
--- a/src/be/nikiroo/utils/ui/WaitingDialog.java
+++ b/src/be/nikiroo/utils/ui/WaitingDialog.java