Merge commit 'ee020e75a5de0c1e54557db79f77edc50e05ea04'

diff --cc src/be/nikiroo/utils/android/ImageUtilsAndroid.class
index 0000000000000000000000000000000000000000,844712ace04c77ed7c3da0b296b053f932a814bb..844712ace04c77ed7c3da0b296b053f932a814bb
mode 000000,100644..100644
Binary files differ

diff --cc src/be/nikiroo/utils/android/test/TestAndroid.class
index 0000000000000000000000000000000000000000,216aa205e56992c4fe9604410672ec924c740933..216aa205e56992c4fe9604410672ec924c740933
mode 000000,100644..100644
Binary files differ

diff --cc src/be/nikiroo/utils/compat/DefaultListModel6.java
index 0000000000000000000000000000000000000000,114ac42eac73fd02ab7a9cbd8381ce5e00c00e5a..114ac42eac73fd02ab7a9cbd8381ce5e00c00e5a
mode 000000,100644..100644
--- /dev/null
--- 2/compat/DefaultListModel6.java
+++ b/src/be/nikiroo/utils/compat/DefaultListModel6.java

diff --cc src/be/nikiroo/utils/compat/JList6.java
index 0000000000000000000000000000000000000000,ca44165067d0676ad62861c3005dc5452fb19469..ca44165067d0676ad62861c3005dc5452fb19469
mode 000000,100644..100644
--- /dev/null
--- 2/compat/JList6.java
+++ b/src/be/nikiroo/utils/compat/JList6.java

diff --cc src/be/nikiroo/utils/compat/ListCellRenderer6.java
index 0000000000000000000000000000000000000000,d00484982599dd6cd4e074743b1b6a3693ee3685..d00484982599dd6cd4e074743b1b6a3693ee3685
mode 000000,100644..100644
--- /dev/null
--- 2/compat/ListCellRenderer6.java
+++ b/src/be/nikiroo/utils/compat/ListCellRenderer6.java

diff --cc src/be/nikiroo/utils/compat/ListModel6.java
index 0000000000000000000000000000000000000000,a1f8c60766a29a2e54913359f3d56308ae392d8a..a1f8c60766a29a2e54913359f3d56308ae392d8a
mode 000000,100644..100644
--- /dev/null
--- 2/compat/ListModel6.java
+++ b/src/be/nikiroo/utils/compat/ListModel6.java

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

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

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

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

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

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

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

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

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

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

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

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

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