Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

author David Sarrut <david.sarrut@gmail.com>

Mon, 3 Sep 2012 07:39:03 +0000 (09:39 +0200)

committer David Sarrut <david.sarrut@gmail.com>

Mon, 3 Sep 2012 07:39:03 +0000 (09:39 +0200)
author David Sarrut <david.sarrut@gmail.com>
Mon, 3 Sep 2012 07:39:03 +0000 (09:39 +0200)
committer David Sarrut <david.sarrut@gmail.com>
Mon, 3 Sep 2012 07:39:03 +0000 (09:39 +0200)
diff --cc tools/clitkImageStatisticsGenericFilter.txx
Simple merge
author	David Sarrut <david.sarrut@gmail.com>
	Mon, 3 Sep 2012 07:39:03 +0000 (09:39 +0200)
committer	David Sarrut <david.sarrut@gmail.com>
	Mon, 3 Sep 2012 07:39:03 +0000 (09:39 +0200)