[med-svn] [orthanc-imagej] 09/12: Merge tag 'upstream/1.1+dfsg'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository orthanc-imagej.

commit 683a88477597dac2573db6c1a839e9cb49e7d681
Merge: 5e41728 2afd844
Author: Andreas Tille <tille at debian.org>
Date:   Tue Apr 19 14:54:09 2016 +0200

    Merge tag 'upstream/1.1+dfsg'
    
    Upstream version 1.1+dfsg

 .hg_archival.txt                                  |   5 +
 AUTHORS                                           |   5 +
 CMakeLists.txt                                    |  44 ++
 COPYING                                           | 674 ++++++++++++++++++++++
 INSTALL                                           |  36 ++
 NEWS                                              |  15 +
 README                                            |  57 ++
 com/orthancserver/DicomDecoder.java               | 427 ++++++++++++++
 com/orthancserver/GridLayout2.java                | 167 ++++++
 com/orthancserver/HttpsTrustModifier.java         |  84 +++
 com/orthancserver/Orthanc.java                    |  51 ++
 com/orthancserver/OrthancConfigurationDialog.java | 170 ++++++
 com/orthancserver/OrthancConnection.java          | 242 ++++++++
 com/orthancserver/PreviewPanel.java               |  82 +++
 com/orthancserver/SelectImageDialog.java          | 580 +++++++++++++++++++
 debian/README.Debian                              |   7 -
 debian/changelog                                  |  12 -
 debian/compat                                     |   1 -
 debian/control                                    |  35 --
 debian/copyright                                  |  29 -
 debian/dirs                                       |   1 -
 debian/install                                    |   1 -
 debian/patches/json-simple                        |  38 --
 debian/patches/series                             |   1 -
 debian/rules                                      |  19 -
 debian/source/format                              |   1 -
 debian/upstream/metadata                          |   6 -
 debian/watch                                      |   3 -
 plugins.config                                    |   1 +
 29 files changed, 2640 insertions(+), 154 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc-imagej.git