[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. 70d5202b584abb9aa0a4ec63dfd0837d194b5dd1

[Mathieu M. <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, master has been updated
       via  70d5202b584abb9aa0a4ec63dfd0837d194b5dd1 (commit)
       via  40422b47c3457e06c1f58cff2979f48942c88a8a (commit)
       via  10ecfc05c8fbd2858ae9ad1ee04cadf55a75f900 (commit)
       via  818ff9b138a457a3094988871c3badb43092e93f (commit)
       via  4135c12fa375ab125ef55f5675b01760a9087499 (commit)
      from  fae6aed21f4ea5d45404c997fc605f7f8f442fda (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/70d5202b584abb9aa0a4ec63dfd0837d194b5dd1/

commit 70d5202b584abb9aa0a4ec63dfd0837d194b5dd1
Merge: fae6aed 40422b4
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Feb 23 13:52:28 2017 +0100

    Merge branch 'release'
    
    Conflicts:
    	CMakeLists.txt
    	Utilities/VTK/vtkImageMapToColors16.cxx
    	Utilities/VTK/vtkImageMapToColors16.h


-----------------------------------------------------------------------

Summary of changes:
 Source/MediaStorageAndFileFormat/gdcmImageHelper.cxx | 12 ++++++------
 Utilities/VTK/CMakeLists.txt                         |  4 +++-
 Utilities/VTK/vtkImageMapToColors16.cxx              |  2 +-
 Utilities/VTK/vtkImageMapToColors16.h                |  8 +++-----
 4 files changed, 13 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM