From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Tue, 8 Dec 2015 09:07:05 +0000 (+0100)
Subject: Merge branch 'master' into VTK6_Qt5
X-Git-Tag: v1.4.0~86
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d6a6a206c0a533a60519e9b3e82fba48d1240c3e;p=clitk.git

Merge branch 'master' into VTK6_Qt5
---

d6a6a206c0a533a60519e9b3e82fba48d1240c3e