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

Trivial merge