[med-svn] [mricron] 02/03: Merge tag 'upstream/0.20140804.1_dfsg.1'

[Michael Hanke]

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

mih pushed a commit to annotated tag debian/0.20140804.1_dfsg.1-1
in repository mricron.

commit 12c839b3ac24e6c460ff096d39e267138d305b43
Merge: e42fa3d 280f4a7
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Fri Oct 3 15:19:39 2014 +0200

    Merge tag 'upstream/0.20140804.1_dfsg.1'
    
    Upstream version 0.20140804.1~dfsg.1
    
    # gpg: Signature made Fr 03 Okt 2014 15:19:34 CEST using RSA key ID 7FFB9E9B
    # gpg: Good signature from "Michael Hanke <michael.hanke at gmail.com>"
    # gpg:                 aka "Michael Hanke <michael.hanke at dartmouth.edu>"
    # gpg:                 aka "Michael Hanke <michael.hanke at ovgu.de>"
    # gpg:                 aka "[jpeg image of size 1962]"
    # gpg:                 aka "Michael Hanke <mih at voxindeserto.de>"
    # gpg:                 aka "Michael Hanke <mih at debian.org>"

 common/define_types.pas                          |   2 +-
 dcm2nii/convert.pas                              |   2 +
 dcm2nii/dcm2nii.app/Contents/Info.plist          |  43 --------
 dcm2nii/dcm2nii.app/Contents/MacOS/dcm2nii       |   1 -
 dcm2nii/dcm2nii.app/Contents/PkgInfo             |   1 -
 dcm2nii/dcm2nii.lpi                              | 103 +++++++++----------
 dcm2nii/dcm2niigui.app/Contents/Info.plist       |  43 --------
 dcm2nii/dcm2niigui.app/Contents/MacOS/dcm2niigui |   1 -
 dcm2nii/dcm2niigui.app/Contents/PkgInfo          |   1 -
 dcm2nii/dcm2niigui.lpi                           | 121 ++++++++++++-----------
 dcm2nii/parconvert.pas                           |  12 ++-
 mricron.app/Contents/Info.plist                  |  43 --------
 mricron.app/Contents/MacOS/mricron               |   1 -
 mricron.app/Contents/PkgInfo                     |   1 -
 mricron.lpi                                      |  77 +++++++--------
 npm/MeanFLU.nii.gz                               | Bin 291497 -> 0 bytes
 npm/npm.app/Contents/Info.plist                  |  43 --------
 npm/npm.app/Contents/MacOS/npm                   |   1 -
 npm/npm.app/Contents/PkgInfo                     |   1 -
 npm/wlsFLU.nii.gz                                | Bin 293632 -> 0 bytes
 20 files changed, 164 insertions(+), 333 deletions(-)

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