From: cervenansky <frederic.cervenansky@creatis.insa-lyon.fr>
Date: Wed, 23 Jan 2013 11:29:15 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8d9ac54358fa1c85166e972840a0d0f41e3f74bb;p=bbtk.git

Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk

Conflicts:
	kernel/cmake/BBTKConfigurePackage.cmake
---

8d9ac54358fa1c85166e972840a0d0f41e3f74bb