[libjide-oss-java] 02/07: Merge tag 'upstream/3.6.14+dfsg'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository libjide-oss-java.

commit d633c6358a14952b750e9540dd75fbd759ecb72f
Merge: e5eff03 93b9a01
Author: Markus Koschany <apo at debian.org>
Date:   Fri Apr 29 14:06:32 2016 +0200

    Merge tag 'upstream/3.6.14+dfsg'
    
    Upstream version 3.6.14+dfsg
    
    # gpg: Signature made Fri 29 Apr 2016 14:06:28 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 ChangeLog                                        | 22 ++++++++++++
 README.txt                                       |  2 +-
 build.properties                                 |  2 +-
 pom.xml                                          |  2 +-
 src/com/jidesoft/hints/AbstractIntelliHints.java | 46 +++++++++++++++---------
 src/com/jidesoft/hints/IntelliHints.java         | 17 +++++++++
 src/com/jidesoft/range/BooleanRange.java         |  2 +-
 src/com/jidesoft/swing/SidePane.java             |  8 +++--
 8 files changed, 77 insertions(+), 24 deletions(-)

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