]> Creatis software - clitk.git/commitdiff
Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
authorRomulo Pinho <romulo.pinho@lyon.unicancer.fr>
Fri, 10 Feb 2012 09:54:07 +0000 (10:54 +0100)
committerRomulo Pinho <romulo.pinho@lyon.unicancer.fr>
Fri, 10 Feb 2012 09:54:07 +0000 (10:54 +0100)
Conflicts:
common/clitkCoeffsToDVF.h
tools/clitkCoeffsToDVF.cxx

1  2 
tools/CMakeLists.txt

Simple merge