From: David Sarrut <david.sarrut@gmail.com>
Date: Thu, 23 Feb 2012 15:32:44 +0000 (+0100)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.3.0~52^2~58
X-Git-Url: http://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5312281fb385245fff3d64693e1549ffc27206e4;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
add qvtk
Conflicts:
	cmake/dependencies.cmake
---

5312281fb385245fff3d64693e1549ffc27206e4