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

Merge branch 'master' into OpenGL2
---

755bb12001696923319a0b95f7109ab92e645abf