From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Thu, 19 Jan 2017 08:07:04 +0000 (+0100)
Subject: Merge branch 'master' into OpenGL2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6d64752235a5e7b4231737e8922cf5d053fea705;p=clitk.git

Merge branch 'master' into OpenGL2
---

6d64752235a5e7b4231737e8922cf5d053fea705