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

[Michael Hanke]

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

mih pushed a commit to branch master
in repository mricron.

commit 84e0792de5576d81db9b5bb7ad667480bd3eaf14
Merge: e80d9fe 2f6e980
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Fri Jul 27 10:20:14 2012 +0200

    Merge tag 'upstream/0.20120707.1_dfsg.1'
    
    Upstream version 0.20120707.1~dfsg.1
    
    # gpg: Signature made Fri 27 Jul 2012 10:20:01 AM 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>"

 _delphi.bat                                |   16 +-
 _delphizip.bat                             |   19 +--
 common/define_types.pas                    |    6 +-
 dcm2nii/convert.pas                        |    7 +-
 dcm2nii/csaread.pas                        |  247 ++++++++++++++++++++++++++++
 dcm2nii/dcm2nii.app/Contents/Info.plist    |   43 +++++
 dcm2nii/dcm2nii.app/Contents/MacOS/dcm2nii |    1 +
 dcm2nii/dcm2nii.app/Contents/PkgInfo       |    1 +
 dcm2nii/dcm2nii.lpi                        |  213 +++++++++++++-----------
 dcm2nii/dcm2niigui.ini                     |    7 +-
 dcm2nii/dcm2niigui.lpi                     |  229 ++++++++++++++------------
 dcm2nii/dcm2niigui.lpr                     |   13 +-
 dcm2nii/dcm2niigui.res                     |  Bin 17744 -> 18568 bytes
 dcm2nii/dicomcompat.pas                    |   26 ++-
 dcm2nii/dicomtypes.pas                     |   34 +---
 dcm2nii/gui.lfm                            |   16 +-
 dcm2nii/gui.lrs                            |   86 +++++-----
 dcm2nii/gui.pas                            |   21 ++-
 dcm2nii/userdir.pas                        |  220 +++++++++++++++++++++++++
 mricron.ini                                |    9 +-
 mricron.lpi                                |  143 ++++++++--------
 mricron.res                                |  Bin 30728 -> 30726 bytes
 nifti_img_view.lfm                         |   52 +++---
 nifti_img_view.lrs                         |  140 ++++++++--------
 nifti_img_view.pas                         |    8 +-
 25 files changed, 1054 insertions(+), 503 deletions(-)

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