From: Niki Roo Date: Thu, 2 Jan 2020 15:05:05 +0000 (+0100) Subject: Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc' X-Git-Tag: fanfix-3.0.1~10 X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=c4cefaa04ec122fc02efb6542451a31fdf722c32;p=fanfix.git Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc' --- c4cefaa04ec122fc02efb6542451a31fdf722c32 diff --cc src/jexer/examples/imgls index 0000000,99bbb9c..99bbb9c mode 000000,100755..100755 --- a/src/jexer/examples/imgls +++ b/src/jexer/examples/imgls diff --cc src/jexer/resources/help.xml index 0000000,7c68c02..7c68c02 mode 000000,100644..100644 --- a/src/jexer/resources/help.xml +++ b/src/jexer/resources/help.xml diff --cc src/jexer/screenshots/screenshot1_old.png index 0000000,10e9ec2..10e9ec2 mode 000000,100644..100644 Binary files differ diff --cc src/jexer/src/jexer/EditMenuUser.java index 0000000,52dc33e..52dc33e mode 000000,100644..100644 --- a/src/jexer/src/jexer/EditMenuUser.java +++ b/src/jexer/src/jexer/EditMenuUser.java diff --cc src/jexer/src/jexer/THelpWindow.java index 0000000,ee7ce54..ee7ce54 mode 000000,100644..100644 --- a/src/jexer/src/jexer/THelpWindow.java +++ b/src/jexer/src/jexer/THelpWindow.java diff --cc src/jexer/src/jexer/THelpWindow.properties index 0000000,2b25484..2b25484 mode 000000,100644..100644 --- a/src/jexer/src/jexer/THelpWindow.properties +++ b/src/jexer/src/jexer/THelpWindow.properties diff --cc src/jexer/src/jexer/backend/HeadlessBackend.java index 0000000,19fb589..19fb589 mode 000000,100644..100644 --- a/src/jexer/src/jexer/backend/HeadlessBackend.java +++ b/src/jexer/src/jexer/backend/HeadlessBackend.java diff --cc src/jexer/src/jexer/bits/Clipboard.java index 0000000,5c1ea9a..5c1ea9a mode 000000,100644..100644 --- a/src/jexer/src/jexer/bits/Clipboard.java +++ b/src/jexer/src/jexer/bits/Clipboard.java diff --cc src/jexer/src/jexer/demos/Demo8.java index 0000000,19fe5ff..19fe5ff mode 000000,100644..100644 --- a/src/jexer/src/jexer/demos/Demo8.java +++ b/src/jexer/src/jexer/demos/Demo8.java diff --cc src/jexer/src/jexer/demos/Demo8.properties index 0000000,08a8217..08a8217 mode 000000,100644..100644 --- a/src/jexer/src/jexer/demos/Demo8.properties +++ b/src/jexer/src/jexer/demos/Demo8.properties diff --cc src/jexer/src/jexer/help/HelpFile.java index 0000000,7a6f49e..7a6f49e mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/HelpFile.java +++ b/src/jexer/src/jexer/help/HelpFile.java diff --cc src/jexer/src/jexer/help/HelpFile.properties index 0000000,803961b..803961b mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/HelpFile.properties +++ b/src/jexer/src/jexer/help/HelpFile.properties diff --cc src/jexer/src/jexer/help/Link.java index 0000000,665381c..665381c mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/Link.java +++ b/src/jexer/src/jexer/help/Link.java diff --cc src/jexer/src/jexer/help/THelpText.java index 0000000,2e0afcf..2e0afcf mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/THelpText.java +++ b/src/jexer/src/jexer/help/THelpText.java diff --cc src/jexer/src/jexer/help/TParagraph.java index 0000000,04559da..04559da mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/TParagraph.java +++ b/src/jexer/src/jexer/help/TParagraph.java diff --cc src/jexer/src/jexer/help/TWord.java index 0000000,d46a22e..d46a22e mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/TWord.java +++ b/src/jexer/src/jexer/help/TWord.java diff --cc src/jexer/src/jexer/help/Topic.java index 0000000,8c0bc71..8c0bc71 mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/Topic.java +++ b/src/jexer/src/jexer/help/Topic.java diff --cc src/jexer/src/jexer/help/Topic.properties index 0000000,1c8de6f..1c8de6f mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/Topic.properties +++ b/src/jexer/src/jexer/help/Topic.properties diff --cc src/jexer/src/jexer/help/package-info.java index 0000000,409c370..409c370 mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/package-info.java +++ b/src/jexer/src/jexer/help/package-info.java