[simplyhtml] 02/03: Merge tag 'upstream/0.16.18'

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository simplyhtml.

commit fe30a2fa6cc50b6c3dc2b3d93d658b422d6629c6
Merge: 02c5957 3ccfb2a
Author: Felix Natter <fnatter at gmx.net>
Date:   Sun Jul 31 18:27:50 2016 +0200

    Merge tag 'upstream/0.16.18'
    
    Upstream version 0.16.18

 build.gradle                                       |   2 +-
 src/com/lightdev/app/shtm/DynamicResource.java     |   2 +
 src/com/lightdev/app/shtm/FrmMain.java             |   2 +-
 src/com/lightdev/app/shtm/SHTMLAction.java         |   7 -
 src/com/lightdev/app/shtm/SHTMLDocument.java       |  21 +-
 .../lightdev/app/shtm/SHTMLEditorKitActions.java   | 579 ++++++++-------------
 src/com/lightdev/app/shtm/SHTMLEditorPane.java     |  17 +-
 src/com/lightdev/app/shtm/SHTMLPanelImpl.java      |  29 +-
 .../app/shtm/resources/SimplyHTML.properties       |   9 +
 .../shtm/resources/SimplyHTML_common.properties    |  33 +-
 .../app/shtm/resources/SimplyHTML_de.properties    |   8 +
 11 files changed, 334 insertions(+), 375 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git