From: mpech <maxime.pech@insa-lyon.fr>
Date: Fri, 8 Jul 2011 12:22:58 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~295
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bc6c780aea4d4b1b5736360ac8febd1ee550c463;p=clitk.git

Merge branch 'master' of /home/dsarrut/clitk3.server

Conflicts:
	tests/tools/CMakeLists.txt
---

bc6c780aea4d4b1b5736360ac8febd1ee550c463