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

Trivial merge