git://git.nikiroo.be / fanfix-jexer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67e8803 faad7ff)
Merge commit 'faad7ff24ecb94772745ecb68ccf921d656dbeb6'
authorNiki Roo <niki@nikiroo.be>
Tue, 5 May 2020 16:35:17 +0000 (18:35 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 5 May 2020 16:35:17 +0000 (18:35 +0200)
1  2 
src/be/nikiroo/utils/ImageUtils.java patch | diff1 | diff2 | blob | history
src/be/nikiroo/utils/ui/BreadCrumbsBar.java patch | diff1 | diff2 | blob | history
src/be/nikiroo/utils/ui/ImageUtilsAwt.java patch | diff1 | diff2 | blob | history
src/be/nikiroo/utils/ui/NavBar.java patch | | diff2 | blob | history
src/be/nikiroo/utils/ui/WaitingDialog.java patch | | diff2 | blob | history

diff --cc src/be/nikiroo/utils/ImageUtils.java
Simple merge
diff --cc src/be/nikiroo/utils/ui/NavBar.java
index 0000000000000000000000000000000000000000,e99115c329ede86d6cd7919618d6b0346134d39e..e99115c329ede86d6cd7919618d6b0346134d39e
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/WaitingDialog.java
index 0000000000000000000000000000000000000000,0fd4574d893aa5e5650e4adc73e83ae9efba15ae..0fd4574d893aa5e5650e4adc73e83ae9efba15ae
mode 000000,100644..100644
--- /dev/null
--- 2/ui/WaitingDialog.java
+++ b/src/be/nikiroo/utils/ui/WaitingDialog.java
A text interface (Jexer library) for the comics/stories/mangas library Fanfix