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

Trivial merge