From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Tue, 12 Jan 2016 10:10:34 +0000 (+0100)
Subject: Merge branch 'VTK6_Qt5_4DROI' into VTK6_Qt5
X-Git-Tag: v1.4.0~76
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=c1118f288aa299f668cc5f24e44934518b20d905;hp=c1118f288aa299f668cc5f24e44934518b20d905;p=clitk.git

Merge branch 'VTK6_Qt5_4DROI' into VTK6_Qt5
---