From: Niki Roo <niki@nikiroo.be>
Date: Wed, 22 Apr 2020 18:04:15 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=44fc40eccac54e9458a71b272b199d4b712a0b37;p=fanfix.git

Merge branch 'subtree'
---

44fc40eccac54e9458a71b272b199d4b712a0b37
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,e0aea42..e0aea42
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