Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc'

diff --cc src/jexer/TApplication.java
Simple merge

diff --cc src/jexer/TApplication.properties
Simple merge

diff --cc src/jexer/TEditorWidget.java
Simple merge

diff --cc src/jexer/TEditorWindow.java
Simple merge

diff --cc src/jexer/TExceptionDialog.java
Simple merge

diff --cc src/jexer/TExceptionDialog.properties
Simple merge

diff --cc src/jexer/TField.java
Simple merge

diff --cc src/jexer/TImage.java
Simple merge

diff --cc src/jexer/TKeypress.java
Simple merge

diff --cc src/jexer/TList.java
Simple merge

diff --cc src/jexer/TPasswordField.java
Simple merge

diff --cc src/jexer/TRadioButton.java
Simple merge

diff --cc src/jexer/TRadioGroup.java
Simple merge

diff --cc src/jexer/TSplitPane.java
Simple merge

diff --cc src/jexer/TTableWidget.java
Simple merge

diff --cc src/jexer/TTableWindow.java
Simple merge

diff --cc src/jexer/TTerminalWidget.java
Simple merge

diff --cc src/jexer/TTerminalWindow.java
Simple merge

diff --cc src/jexer/TTerminalWindow.properties
Simple merge

diff --cc src/jexer/TText.java
Simple merge

diff --cc src/jexer/TWidget.java
Simple merge

diff --cc src/jexer/TWindow.java
Simple merge

diff --cc src/jexer/backend/ECMA48Terminal.java
Simple merge

diff --cc src/jexer/backend/GlyphMaker.java
Simple merge

diff --cc src/jexer/backend/LogicalScreen.java
Simple merge

diff --cc src/jexer/backend/MultiScreen.java
Simple merge

diff --cc src/jexer/backend/Screen.java
Simple merge

diff --cc src/jexer/backend/SwingComponent.java
Simple merge

diff --cc src/jexer/backend/SwingTerminal.java
Simple merge

diff --cc src/jexer/bits/Cell.java
Simple merge

diff --cc src/jexer/bits/CellAttributes.java
Simple merge

diff --cc src/jexer/bits/ColorTheme.java
Simple merge

diff --cc src/jexer/bits/StringUtils.java
Simple merge

diff --cc src/jexer/demos/Demo6.java
Simple merge

diff --cc src/jexer/demos/DemoCheckBoxWindow.java
Simple merge

diff --cc src/jexer/event/TMouseEvent.java
Simple merge

diff --cc src/jexer/examples/imgls
index 0000000000000000000000000000000000000000,99bbb9cf0fbf993ac608c345063cae662f7fc104..99bbb9cf0fbf993ac608c345063cae662f7fc104
mode 000000,100755..100755
--- /dev/null
--- 2/examples/imgls
+++ b/src/jexer/examples/imgls

diff --cc src/jexer/io/TimeoutInputStream.java
Simple merge

diff --cc src/jexer/layout/StretchLayoutManager.java
Simple merge

diff --cc src/jexer/menu/TMenu.java
Simple merge

diff --cc src/jexer/menu/TMenu.properties
Simple merge

diff --cc src/jexer/menu/TMenuItem.java
Simple merge

diff --cc src/jexer/menu/TSubMenu.java
Simple merge

diff --cc src/jexer/resources/help.xml
index 0000000000000000000000000000000000000000,7c68c02c62605f2321218360c71cdef8239886e7..7c68c02c62605f2321218360c71cdef8239886e7
mode 000000,100644..100644
--- /dev/null
--- 2/resources/help.xml
+++ b/src/jexer/resources/help.xml

diff --cc src/jexer/screenshots/screenshot1_old.png
index 0000000000000000000000000000000000000000,10e9ec2a2274901aff47ed0c308c090c18347df2..10e9ec2a2274901aff47ed0c308c090c18347df2
mode 000000,100644..100644
Binary files differ

diff --cc src/jexer/src/jexer/EditMenuUser.java
index 0000000000000000000000000000000000000000,52dc33e4db97a806ccc059ec94ec9483f5f1a152..52dc33e4db97a806ccc059ec94ec9483f5f1a152
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/EditMenuUser.java
+++ b/src/jexer/src/jexer/EditMenuUser.java

diff --cc src/jexer/src/jexer/THelpWindow.java
index 0000000000000000000000000000000000000000,ee7ce54436111e3bac324ef859b404a0cbc07a85..ee7ce54436111e3bac324ef859b404a0cbc07a85
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/THelpWindow.java
+++ b/src/jexer/src/jexer/THelpWindow.java

diff --cc src/jexer/src/jexer/THelpWindow.properties
index 0000000000000000000000000000000000000000,2b25484ca4a93a4c4b461cd6e0aca44eda354fc2..2b25484ca4a93a4c4b461cd6e0aca44eda354fc2
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/THelpWindow.properties
+++ b/src/jexer/src/jexer/THelpWindow.properties

diff --cc src/jexer/src/jexer/backend/HeadlessBackend.java
index 0000000000000000000000000000000000000000,19fb58918289364eb3044132a794d4bdb4506903..19fb58918289364eb3044132a794d4bdb4506903
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/backend/HeadlessBackend.java
+++ b/src/jexer/src/jexer/backend/HeadlessBackend.java

diff --cc src/jexer/src/jexer/bits/Clipboard.java
index 0000000000000000000000000000000000000000,5c1ea9aa3efca5d12a8b7ddade2f139e64df4662..5c1ea9aa3efca5d12a8b7ddade2f139e64df4662
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/bits/Clipboard.java
+++ b/src/jexer/src/jexer/bits/Clipboard.java

diff --cc src/jexer/src/jexer/demos/Demo8.java
index 0000000000000000000000000000000000000000,19fe5ff52649fffcc7a1ad64f3fccc0dc686db6f..19fe5ff52649fffcc7a1ad64f3fccc0dc686db6f
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/demos/Demo8.java
+++ b/src/jexer/src/jexer/demos/Demo8.java

diff --cc src/jexer/src/jexer/demos/Demo8.properties
index 0000000000000000000000000000000000000000,08a821771474a4e6407ba982c1f1bed9f6301a38..08a821771474a4e6407ba982c1f1bed9f6301a38
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/demos/Demo8.properties
+++ b/src/jexer/src/jexer/demos/Demo8.properties

diff --cc src/jexer/src/jexer/help/HelpFile.java
index 0000000000000000000000000000000000000000,7a6f49e54f465a862a40514552b1229a74e3c561..7a6f49e54f465a862a40514552b1229a74e3c561
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/HelpFile.java
+++ b/src/jexer/src/jexer/help/HelpFile.java

diff --cc src/jexer/src/jexer/help/HelpFile.properties
index 0000000000000000000000000000000000000000,803961b9cb48c04c3b9d8a8e4aebfdcc5fbcb09f..803961b9cb48c04c3b9d8a8e4aebfdcc5fbcb09f
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/HelpFile.properties
+++ b/src/jexer/src/jexer/help/HelpFile.properties

diff --cc src/jexer/src/jexer/help/Link.java
index 0000000000000000000000000000000000000000,665381cbd9efe6b31a8e23d3a5a38df8f45238a1..665381cbd9efe6b31a8e23d3a5a38df8f45238a1
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/Link.java
+++ b/src/jexer/src/jexer/help/Link.java

diff --cc src/jexer/src/jexer/help/THelpText.java
index 0000000000000000000000000000000000000000,2e0afcfb74afe9f226782158da9a22d81cdd53a1..2e0afcfb74afe9f226782158da9a22d81cdd53a1
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/THelpText.java
+++ b/src/jexer/src/jexer/help/THelpText.java

diff --cc src/jexer/src/jexer/help/TParagraph.java
index 0000000000000000000000000000000000000000,04559da146592cadc67bd4add5625628570abdaf..04559da146592cadc67bd4add5625628570abdaf
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/TParagraph.java
+++ b/src/jexer/src/jexer/help/TParagraph.java

diff --cc src/jexer/src/jexer/help/TWord.java
index 0000000000000000000000000000000000000000,d46a22e0bc065699efae3bcb9429bf79cd086277..d46a22e0bc065699efae3bcb9429bf79cd086277
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/TWord.java
+++ b/src/jexer/src/jexer/help/TWord.java

diff --cc src/jexer/src/jexer/help/Topic.java
index 0000000000000000000000000000000000000000,8c0bc7126d54044770d4e1c2363f9352b56f19a0..8c0bc7126d54044770d4e1c2363f9352b56f19a0
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/Topic.java
+++ b/src/jexer/src/jexer/help/Topic.java

diff --cc src/jexer/src/jexer/help/Topic.properties
index 0000000000000000000000000000000000000000,1c8de6f910a1e6794373190da62b97c10f7b2007..1c8de6f910a1e6794373190da62b97c10f7b2007
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/Topic.properties
+++ b/src/jexer/src/jexer/help/Topic.properties

diff --cc src/jexer/src/jexer/help/package-info.java
index 0000000000000000000000000000000000000000,409c370c537288a84646e38adfb96c76a983cc3a..409c370c537288a84646e38adfb96c76a983cc3a
mode 000000,100644..100644
--- /dev/null
--- 2/src/jexer/help/package-info.java
+++ b/src/jexer/src/jexer/help/package-info.java

diff --cc src/jexer/teditor/Document.java
Simple merge

diff --cc src/jexer/teditor/Highlighter.java
Simple merge

diff --cc src/jexer/teditor/Line.java
Simple merge

diff --cc src/jexer/teditor/Word.java
Simple merge

diff --cc src/jexer/tterminal/DisplayLine.java
Simple merge

diff --cc src/jexer/tterminal/ECMA48.java
Simple merge

diff --cc src/jexer/tterminal/Sixel.java
Simple merge

diff --cc src/jexer/ttree/TTreeViewWidget.java
Simple merge