]> Creatis software - clitk.git/commit
Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
authorSimon Rit <simon.rit@creatis.insa-lyon.fr>
Wed, 10 Oct 2012 08:26:39 +0000 (10:26 +0200)
committerSimon Rit <simon.rit@creatis.insa-lyon.fr>
Wed, 10 Oct 2012 08:26:39 +0000 (10:26 +0200)
commitbc4b7eaef671605cb3e8077ce8a70eb7386890e5
treedeedfb9be2a436af1d13e8d1f99859ffe650744f
parent48549835a461e0fd831a1e2f43f0e70a3077c5ef
parent1cc917fa6b46248867ad53e8de0ef85224525d12
Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

Conflicts:
vv/vv.cxx
vv/vv.cxx
vv/vvSlicerManager.cxx