From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Mon, 23 Jan 2017 15:45:26 +0000 (+0100)
Subject: Merge branch 'master' into OpenGL2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a2884383f43695991c4da67a693f131dfe57785e;p=clitk.git

Merge branch 'master' into OpenGL2
---

a2884383f43695991c4da67a693f131dfe57785e