From: Niki Roo Date: Thu, 2 Jan 2020 15:05:05 +0000 (+0100) Subject: Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc' X-Git-Tag: fanfix-swing-0.0.1~12^2~13 X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=c4cefaa04ec122fc02efb6542451a31fdf722c32;p=fanfix-swing.git Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc' --- c4cefaa04ec122fc02efb6542451a31fdf722c32 diff --cc src/jexer/examples/imgls index 00000000,99bbb9cf..99bbb9cf mode 000000,100755..100755 --- a/src/jexer/examples/imgls +++ b/src/jexer/examples/imgls diff --cc src/jexer/resources/help.xml index 00000000,7c68c02c..7c68c02c 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 00000000,10e9ec2a..10e9ec2a mode 000000,100644..100644 Binary files differ diff --cc src/jexer/src/jexer/EditMenuUser.java index 00000000,52dc33e4..52dc33e4 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 00000000,ee7ce544..ee7ce544 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 00000000,2b25484c..2b25484c 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 00000000,19fb5891..19fb5891 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 00000000,5c1ea9aa..5c1ea9aa 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 00000000,19fe5ff5..19fe5ff5 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 00000000,08a82177..08a82177 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 00000000,7a6f49e5..7a6f49e5 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 00000000,803961b9..803961b9 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 00000000,665381cb..665381cb 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 00000000,2e0afcfb..2e0afcfb 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 00000000,04559da1..04559da1 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 00000000,d46a22e0..d46a22e0 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 00000000,8c0bc712..8c0bc712 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 00000000,1c8de6f9..1c8de6f9 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 00000000,409c370c..409c370c mode 000000,100644..100644 --- a/src/jexer/src/jexer/help/package-info.java +++ b/src/jexer/src/jexer/help/package-info.java