From: Niki Roo Date: Tue, 5 May 2020 16:35:17 +0000 (+0200) Subject: Merge commit 'faad7ff24ecb94772745ecb68ccf921d656dbeb6' X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=5d40fd9c4cea4913a46873f1489f1227f5a12d2f;p=fanfix-jexer.git Merge commit 'faad7ff24ecb94772745ecb68ccf921d656dbeb6' --- 5d40fd9c4cea4913a46873f1489f1227f5a12d2f 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