Merge commit '7ce18848c8327967ce27b90abf2e280953530b5f'

diff --cc src/be/nikiroo/utils/Downloader.java
Simple merge

diff --cc src/be/nikiroo/utils/ImageUtils.java
Simple merge

diff --cc src/be/nikiroo/utils/VersionCheck.java
index 0000000000000000000000000000000000000000,0e16c2b5291c4e0a4bb445f8263e78374c3ff7c1..0e16c2b5291c4e0a4bb445f8263e78374c3ff7c1
mode 000000,100644..100644
--- /dev/null
--- 2/VersionCheck.java
+++ b/src/be/nikiroo/utils/VersionCheck.java

diff --cc src/be/nikiroo/utils/resources/Bundle.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/BreadCrumbsBar.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ImageUtilsAwt.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/ListModel.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/NavBar.java
index 0000000000000000000000000000000000000000,607b2cff2c3918e9d27b14648ca570fb82c4b25c..607b2cff2c3918e9d27b14648ca570fb82c4b25c
mode 000000,100644..100644
--- /dev/null
--- 2/ui/NavBar.java
+++ b/src/be/nikiroo/utils/ui/NavBar.java

diff --cc src/be/nikiroo/utils/ui/UIUtils.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/WaitingDialog.java
index 0000000000000000000000000000000000000000,0fd4574d893aa5e5650e4adc73e83ae9efba15ae..0fd4574d893aa5e5650e4adc73e83ae9efba15ae
mode 000000,100644..100644
--- /dev/null
--- 2/ui/WaitingDialog.java
+++ b/src/be/nikiroo/utils/ui/WaitingDialog.java

diff --cc src/be/nikiroo/utils/ui/ZoomBox.java
index 0000000000000000000000000000000000000000,a8f96095928a8a9dba8a92fde829f6e31019f817..a8f96095928a8a9dba8a92fde829f6e31019f817
mode 000000,100644..100644
--- /dev/null
--- 2/ui/ZoomBox.java
+++ b/src/be/nikiroo/utils/ui/ZoomBox.java

diff --cc src/be/nikiroo/utils/ui/compat/DefaultListModel6.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/compat/JList6.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/compat/ListCellRenderer6.java
Simple merge

diff --cc src/be/nikiroo/utils/ui/compat/ListModel6.java
Simple merge