]> Creatis software - clitk.git/commitdiff
Merge branch 'master' into OpenGL2
authortbaudier <thomas.baudier@creatis.insa-lyon.fr>
Mon, 23 Jan 2017 14:26:55 +0000 (15:26 +0100)
committertbaudier <thomas.baudier@creatis.insa-lyon.fr>
Mon, 23 Jan 2017 14:26:55 +0000 (15:26 +0100)

Trivial merge