From: Niki Roo Date: Sat, 25 Apr 2020 15:17:21 +0000 (+0200) Subject: Merge commit 'ee020e75a5de0c1e54557db79f77edc50e05ea04' X-Git-Tag: fanfix-3.1.2~20 X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=f19b48e27a56ebab18687debd9ef52581a03f06d;p=fanfix.git Merge commit 'ee020e75a5de0c1e54557db79f77edc50e05ea04' --- f19b48e27a56ebab18687debd9ef52581a03f06d diff --cc src/be/nikiroo/utils/android/ImageUtilsAndroid.class index 0000000,844712a..844712a mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/utils/android/test/TestAndroid.class index 0000000,216aa20..216aa20 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/utils/compat/DefaultListModel6.java index 0000000,114ac42..114ac42 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/compat/DefaultListModel6.java +++ b/src/be/nikiroo/utils/compat/DefaultListModel6.java diff --cc src/be/nikiroo/utils/compat/JList6.java index 0000000,ca44165..ca44165 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/compat/JList6.java +++ b/src/be/nikiroo/utils/compat/JList6.java diff --cc src/be/nikiroo/utils/compat/ListCellRenderer6.java index 0000000,d004849..d004849 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/compat/ListCellRenderer6.java +++ b/src/be/nikiroo/utils/compat/ListCellRenderer6.java diff --cc src/be/nikiroo/utils/compat/ListModel6.java index 0000000,a1f8c60..a1f8c60 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/compat/ListModel6.java +++ b/src/be/nikiroo/utils/compat/ListModel6.java diff --cc src/be/nikiroo/utils/ui/BreadCrumbsBar.java index 0000000,8b993e6..8b993e6 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/BreadCrumbsBar.java +++ b/src/be/nikiroo/utils/ui/BreadCrumbsBar.java diff --cc src/be/nikiroo/utils/ui/DataNode.java index 0000000,2d3ac26..2d3ac26 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/DataNode.java +++ b/src/be/nikiroo/utils/ui/DataNode.java diff --cc src/be/nikiroo/utils/ui/DataTree.java index 0000000,e941a71..e941a71 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/DataTree.java +++ b/src/be/nikiroo/utils/ui/DataTree.java diff --cc src/be/nikiroo/utils/ui/DelayWorker.java index 0000000,3618b89..3618b89 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/DelayWorker.java +++ b/src/be/nikiroo/utils/ui/DelayWorker.java diff --cc src/be/nikiroo/utils/ui/ListModel.java index 0000000,06e7914..06e7914 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/ListModel.java +++ b/src/be/nikiroo/utils/ui/ListModel.java diff --cc src/be/nikiroo/utils/ui/ListenerPanel.java index 0000000,144cdd2..144cdd2 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/ListenerPanel.java +++ b/src/be/nikiroo/utils/ui/ListenerPanel.java diff --cc src/be/nikiroo/utils/ui/TreeCellSpanner.java index 0000000,703bfa1..703bfa1 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/TreeCellSpanner.java +++ b/src/be/nikiroo/utils/ui/TreeCellSpanner.java diff --cc src/be/nikiroo/utils/ui/TreeModelTransformer.java index 0000000,9568f17..9568f17 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/TreeModelTransformer.java +++ b/src/be/nikiroo/utils/ui/TreeModelTransformer.java diff --cc src/be/nikiroo/utils/ui/TreeSnapshot.java index 0000000,ef9a6fb..ef9a6fb mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/TreeSnapshot.java +++ b/src/be/nikiroo/utils/ui/TreeSnapshot.java