From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Fri, 20 Jan 2017 13:42:04 +0000 (+0100)
Subject: Merge branch 'master' into OpenGL2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3c506ad3a3bd68f5ad7508f7427581285b57c541;p=clitk.git

Merge branch 'master' into OpenGL2
---

3c506ad3a3bd68f5ad7508f7427581285b57c541