From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Thu, 18 Feb 2016 06:38:49 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk into VTK6_Qt5
X-Git-Tag: v1.4.0~61^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ff4e821006c760607319ef7cc58dd9f4f17a7098;p=clitk.git

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

ff4e821006c760607319ef7cc58dd9f4f17a7098