[med-svn] [vtk-dicom] 01/01: eliminate merge conflicts

[Gert Wollny]

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

gert-guest pushed a commit to branch upstream
in repository vtk-dicom.

commit 98aad3949d4d4dda6156c5ef58b7cdceaa799db0
Merge: 204548e 4685bd9
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sat Oct 1 21:55:24 2016 +0200

    eliminate merge conflicts

 CMake/pkgIndex.tcl.in                |   19 +-
 CMake/vtkDICOMConfig.h.in            |    9 -
 CMakeLists.txt                       |    7 +-
 DicomCli/mainmacro.cxx               |    6 +-
 DicomCli/readquery.cxx               |  286 +-
 DicomCli/vtkConsoleOutputWindow.cxx  |    4 +-
 Programs/dicomdump.cxx               |  267 +-
 Programs/dicomfind.cxx               |  379 +-
 Programs/dicompull.cxx               |  254 +-
 Programs/dicomtocsv.cxx              |  322 +-
 Programs/dicomtodicom.cxx            |  242 +-
 Programs/dicomtonifti.cxx            |  439 +-
 Programs/niftidump.cxx               |  104 +-
 Programs/niftitodicom.cxx            |  326 +-
 Programs/scancodump.cxx              |   16 +-
 Programs/scancotodicom.cxx           |  254 +-
 Readme.txt                           |    3 +
 Source/CMakeLists.txt                |   15 +-
 Source/vtkDICOMAlgorithm.h           |   57 +-
 Source/vtkDICOMApplyRescale.h        |   37 +-
 Source/vtkDICOMCharacterSet.cxx      |  856 ++--
 Source/vtkDICOMCompiler.cxx          |  524 +--
 Source/vtkDICOMDictHash.cxx          | 5882 ++++++++++++++-------------
 Source/vtkDICOMDictPrivate.cxx       | 7334 ++++++++++++++++------------------
 Source/vtkDICOMDictionary.cxx        |   98 +-
 Source/vtkDICOMDirectory.cxx         |  951 ++---
 Source/vtkDICOMDirectory.h           |   29 +-
 Source/vtkDICOMFile.cxx              |  288 +-
 Source/vtkDICOMFile.h                |    9 -
 Source/vtkDICOMFileDirectory.cxx     |  271 +-
 Source/vtkDICOMFileDirectory.h       |   15 -
 Source/vtkDICOMFilePath.cxx          |  375 +-
 Source/vtkDICOMFilePath.h            |    8 -
 Source/vtkDICOMFileSorter.cxx        |  259 +-
 Source/vtkDICOMGenerator.h           |   40 +-
 Source/vtkDICOMItem.cxx              |  220 +-
 Source/vtkDICOMMetaDataAdapter.cxx   |  162 +-
 Source/vtkDICOMMetaDataAdapter.h     |    6 -
 Source/vtkDICOMParser.cxx            |  777 ++--
 Source/vtkDICOMReader.h              |  363 +-
 Source/vtkDICOMSequence.h            |   16 +-
 Source/vtkDICOMUtilities.cxx         |  593 ++-
 Source/vtkDICOMUtilitiesUIDTable.cxx |   76 +-
 Source/vtkDICOMValue.cxx             | 1123 +++---
 Source/vtkDICOMWriter.h              |  280 +-
 Source/vtkNIFTIReader.cxx            |  464 +--
 Source/vtkNIFTIWriter.cxx            |  340 +-
 Testing/CMakeLists.txt               |   29 +-
 Utilities/nemauids.txt               |    6 -
 49 files changed, 11877 insertions(+), 12563 deletions(-)


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