[med-svn] [mia] 02/03: Merge tag 'upstream/2.2.2'

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository mia.

commit a114bc1a71682e4db5dff09dcc5b6079d4ba9139
Merge: f5c6556 d1353bb
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Oct 9 14:06:01 2014 +0200

    Merge tag 'upstream/2.2.2'
    
    Upstream version 2.2.2

 CMakeLists.txt                 |  6 +++---
 ChangeLog                      | 10 ++++++++++
 addons/dicom/dicom4mia.cc      | 24 +++++++++++++++++++++---
 addons/openexr/CMakeLists.txt  |  1 -
 addons/tiff/tiff.cc            |  6 ++----
 addons/vistaio/CMakeLists.txt  |  1 -
 addons/vtk/CMakeLists.txt      | 10 ++++++----
 addons/vtk/vtkmesh.cc          |  4 +++-
 mia/core/CMakeLists.txt        |  1 -
 mia/core/filetools.cc          |  2 +-
 mia/core/filetools.hh          |  8 +++++++-
 mia/core/test_cmdlineparser.cc |  2 --
 miacore.pc.cmake               |  2 +-
 13 files changed, 54 insertions(+), 23 deletions(-)

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