[libjide-oss-java] 01/03: Merge tag 'upstream/3.6.12+dfsg'

[Markus Koschany]

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

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

commit 064a944bba096248ced2038c277eb907414cc95e
Merge: c0b5d18 f3d4d8e
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 6 18:01:05 2015 +0100

    Merge tag 'upstream/3.6.12+dfsg'
    
    Upstream version 3.6.12+dfsg
    
    # gpg: Signature made Sun 06 Dec 2015 18:01:01 CET 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                                  |  19 +
 README.txt                                 |   2 +-
 build.properties                           |   2 +-
 pom.xml                                    |   2 +-
 src/com/jidesoft/range/CategoryRange.java  | 929 +++++++++++++++--------------
 src/com/jidesoft/swing/JideTabbedPane.java |   6 +-
 src/com/jidesoft/utils/SystemInfo.java     |  21 +-
 7 files changed, 508 insertions(+), 473 deletions(-)

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