From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Tue, 17 Jan 2017 16:06:16 +0000 (+0100)
Subject: Merge branch 'master' into OpenGL2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9d7436d95b301e66644f8763fca8ff142504128a;p=clitk.git

Merge branch 'master' into OpenGL2
---

9d7436d95b301e66644f8763fca8ff142504128a