From: Niki Roo Date: Thu, 7 May 2020 20:30:40 +0000 (+0200) Subject: Merge commit '7ce18848c8327967ce27b90abf2e280953530b5f' X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=5ddc36eacad78641be59db473f9bae9bad47eb20;p=fanfix-swing.git Merge commit '7ce18848c8327967ce27b90abf2e280953530b5f' --- 5ddc36eacad78641be59db473f9bae9bad47eb20 diff --cc src/be/nikiroo/utils/VersionCheck.java index 00000000,0e16c2b5..0e16c2b5 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/NavBar.java index 00000000,607b2cff..607b2cff 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 00000000,0fd4574d..0fd4574d mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/WaitingDialog.java +++ b/src/be/nikiroo/utils/ui/WaitingDialog.java diff --cc src/be/nikiroo/utils/ui/ZoomBox.java index 00000000,a8f96095..a8f96095 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/ZoomBox.java +++ b/src/be/nikiroo/utils/ui/ZoomBox.java