]> Creatis software - clitk.git/commitdiff
Merge branch 'VTK6_Qt5' into VTK6_Qt5_Binarize
authortbaudier <thomas.baudier@creatis.insa-lyon.fr>
Fri, 4 Dec 2015 09:35:34 +0000 (10:35 +0100)
committertbaudier <thomas.baudier@creatis.insa-lyon.fr>
Fri, 4 Dec 2015 09:35:34 +0000 (10:35 +0100)
1  2 
vv/vvMainWindow.cxx
vv/vvSlicer.cxx

Simple merge
diff --cc vv/vvSlicer.cxx
Simple merge