From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Fri, 2 Nov 2012 19:25:11 +0000 (-0700)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~281
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=47ac6a7e9e30deff5ff852c1585b4a86c5f52a8c;hp=47ac6a7e9e30deff5ff852c1585b4a86c5f52a8c;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

Conflicts:
	vv/vvMainWindow.cxx
---