From: Romulo Pinho <romulo.pinho@lyon.unicancer.fr>
Date: Fri, 10 Feb 2012 09:54:07 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.3.0~104
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0c74b91a2df4c56e7130589f1ede54650211db92;p=clitk.git

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

Conflicts:
	common/clitkCoeffsToDVF.h
	tools/clitkCoeffsToDVF.cxx
---

0c74b91a2df4c56e7130589f1ede54650211db92