From: Niki Roo Date: Sat, 25 Apr 2020 12:09:07 +0000 (+0200) Subject: Merge branch 'subtree' X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=60ee255638ef6e151a18ee1a93dd9a6c0e9ee1a7;p=fanfix-swing.git Merge branch 'subtree' --- 60ee255638ef6e151a18ee1a93dd9a6c0e9ee1a7 diff --cc src/be/nikiroo/utils/ui/BreadCrumbsBar.java index 00000000,8b993e64..8b993e64 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 00000000,2d3ac267..2d3ac267 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 00000000,e941a71d..e941a71d 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 00000000,3618b89e..3618b89e 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 00000000,06e7914c..06e7914c 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 00000000,144cdd24..144cdd24 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 00000000,703bfa1c..703bfa1c 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 00000000,9568f175..9568f175 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 00000000,ef9a6fb6..ef9a6fb6 mode 000000,100644..100644 --- a/src/be/nikiroo/utils/ui/TreeSnapshot.java +++ b/src/be/nikiroo/utils/ui/TreeSnapshot.java