[med-svn] [mia] 02/04: Merge tag 'upstream/2.2.1'

[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 75ac9edfd5bad2ae880b0405113fd4e99b94faa8
Merge: bc3cfcb bc318b3
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Wed Sep 17 16:53:07 2014 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 CMakeLists.txt                 |  6 +++---
 ChangeLog                      | 47 ++++++++++++++++++++++++------------------
 addons/hdf5/hdf5mia.cc         | 13 ++++++------
 addons/nifti/niftiimage.cc     |  3 +++
 mia/2d/filter/mean.cc          |  3 ++-
 mia/2d/filter/median.cc        |  3 ++-
 mia/2d/fullcost/maskedimage.hh |  1 -
 mia/2d/io/bmp.cc               |  2 +-
 mia/2d/segframe.cc             |  3 +++
 mia/3d/fullcost/maskedimage.hh |  1 -
 mia/3d/image.cc                |  2 +-
 mia/core/factory.hh            |  2 ++
 mia/core/ica.cc                |  4 ++++
 mia/core/iohandler.cxx         |  2 +-
 mia/core/slopestatistics.cc    |  1 +
 mia/mesh/io/off.cc             | 10 ++++-----
 model_coverty.cpp              | 26 +++++++++++++++++++++++
 src/2dmyoica-full.cc           |  5 +++--
 src/2dsegment-ahmed.cc         |  2 +-
 src/3dsegment-ahmed.cc         |  2 +-
 20 files changed, 93 insertions(+), 45 deletions(-)

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