[med-svn] [mricron] 02/05: Merge tag 'upstream/0.20140303.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 48dad492742b968afc606e4d16116a506c1a6009
Merge: c264ac5 f48c45f
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Mon Apr 14 09:53:04 2014 +0200

    Merge tag 'upstream/0.20140303.1_dfsg.1'
    
    Upstream version 0.20140303.1~dfsg.1
    
    # gpg: Signature made Mo 14 Apr 2014 09:52:54 CEST using RSA key ID 7FFB9E9B
    # gpg: checking the trustdb
    # gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
    # gpg: depth: 0  valid:   2  signed:   7  trust: 0-, 0q, 0n, 0m, 0f, 2u
    # gpg: depth: 1  valid:   7  signed: 113  trust: 5-, 0q, 0n, 0m, 2f, 0u
    # gpg: depth: 2  valid:  10  signed: 100  trust: 9-, 0q, 0n, 0m, 1f, 0u
    # gpg: depth: 3  valid:   1  signed:   0  trust: 1-, 0q, 0n, 0m, 0f, 0u
    # gpg: next trustdb check due at 2014-05-11
    # 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>"

 ROIfilt.pas                     |    4 +-
 _macscriptintel.bat             |    8 +
 common/define_types.pas         |   51 +-
 common/dialogsx.pas             |    9 +
 common/dicomhdr.pas             |   29 +-
 common/gzio2.pas                |  284 ++++++-
 common/gziod.pas                |   50 +-
 common/nifti_foreign.pas        | 1285 +++++++++++++++++++++++++++++++
 common/nifti_hdr.pas            |  540 +++----------
 common/nifti_types.pas          |  166 ++++
 crop.pas                        |    4 +-
 dcm2nii/convert.pas             |  156 +++-
 dcm2nii/csaread.pas             |  172 ++++-
 dcm2nii/dcm2nii.lpi             |  211 +++--
 dcm2nii/dcm2niigui.cfg          |    8 +-
 dcm2nii/dcm2niigui.dof          |   11 +-
 dcm2nii/dcm2niigui.ini          |    5 +-
 dcm2nii/dcm2niigui.lpi          |  331 ++++----
 dcm2nii/dicomcompat.pas         |   39 +-
 dcm2nii/dicomtypes.pas          |   67 +-
 dcm2nii/filename.pas            |    2 +-
 dcm2nii/gui.dfm                 |  Bin 2463 -> 2463 bytes
 dcm2nii/gui.pas                 |   11 +-
 dcm2nii/nifti_form.lfm          |   27 +-
 dcm2nii/nifti_form.lrs          |  115 +--
 dcm2nii/niftiutil.pas           |  381 ++++-----
 dcm2nii/nii_3dto4d.pas          |   16 +-
 dcm2nii/nii_4dto3d.pas          |   19 +-
 dcm2nii/nii_asl.pas             |   48 +-
 dcm2nii/nii_crop.pas            |   88 +--
 dcm2nii/nii_math.pas            |   22 +-
 dcm2nii/nii_orient.pas          |   15 +-
 dcm2nii/nii_reslice.pas         |   13 +-
 dcm2nii/paramstrs.pas           |    5 +
 dcm2nii/parconvert.pas          |    2 +-
 dcm2nii/pref_form.lfm           |   92 ++-
 dcm2nii/pref_form.lrs           |   99 +--
 dcm2nii/pref_form.pas           |    5 +
 dcm2nii/prefs.pas               |    5 +-
 drop.patch                      |   75 ++
 drop_patch.txt                  | 1620 +++++++++++++++++++++++++++++++++++++++
 imgutil.pas                     |    4 +-
 mricron.ini                     |   19 +-
 mricron.lpi                     |  511 ++++++------
 mricron.lpr                     |    2 +-
 nifti_hdr_view.lfm              |  180 ++---
 nifti_hdr_view.lrs              |  236 +++---
 nifti_hdr_view.pas              |   25 +-
 nifti_img.pas                   |  246 ++++--
 nifti_img_view.lfm              |   60 +-
 nifti_img_view.lrs              |  332 ++++----
 nifti_img_view.pas              |  377 +++++----
 nii_label.pas                   |  257 +++++++
 npm/MeanFLU.nii.gz              |  Bin 0 -> 291497 bytes
 npm/Notes.txt                   |   52 ++
 npm/hdr.pas                     |   19 +-
 npm/nifti_img.pas               |    2 +-
 npm/npm.app/Contents/Info.plist |    0
 npm/npm.app/Contents/MacOS/npm  |    0
 npm/npm.app/Contents/PkgInfo    |    0
 npm/npm.cfg                     |    8 +-
 npm/npm.dof                     |    9 +-
 npm/npm.dsk                     |  184 -----
 npm/npm.lpi                     |  267 ++++---
 npm/npmform.dfm                 |  Bin 5083 -> 5082 bytes
 npm/npmform.lfm                 |   19 +-
 npm/npmform.lrs                 |  150 ++--
 npm/npmform.pas                 |   84 +-
 npm/regression.pas              |    9 +-
 npm/stats.pas                   |    1 -
 npm/tfce_clustering.pas         |    2 +-
 npm/turbolesion.pas             |    2 +-
 npm/unpm.pas                    |   17 +-
 npm/wlsFLU.nii.gz               |  Bin 0 -> 293632 bytes
 ortho_reorient.pas              |    2 +-
 render_composite.pas            |    4 +-
 reslice_img.pas                 |    4 +-
 statclustertable.pas            |   41 +-
 templates/aal.nii.txt           |  117 ---
 79 files changed, 6533 insertions(+), 2799 deletions(-)

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