]> Creatis software - clitk.git/commitdiff
Merge branch 'master' of /home/dsarrut/clitk3.server
authormpech <maxime.pech@insa-lyon.fr>
Fri, 8 Jul 2011 12:22:58 +0000 (14:22 +0200)
committermpech <maxime.pech@insa-lyon.fr>
Fri, 8 Jul 2011 12:22:58 +0000 (14:22 +0200)
Conflicts:
tests/tools/CMakeLists.txt


Trivial merge