From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Fri, 16 Sep 2016 11:10:47 +0000 (+0200)
Subject: Merge branch 'master' into vectorImage
X-Git-Tag: v1.4.0~3^2~2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e8f25551d206fb09b49e479dbffd95df14bc88d7;p=clitk.git

Merge branch 'master' into vectorImage
---

e8f25551d206fb09b49e479dbffd95df14bc88d7