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

author David Sarrut <david.sarrut@gmail.com>

Thu, 1 Mar 2012 09:47:59 +0000 (10:47 +0100)

committer David Sarrut <david.sarrut@gmail.com>

Thu, 1 Mar 2012 09:47:59 +0000 (10:47 +0100)
author David Sarrut <david.sarrut@gmail.com>
Thu, 1 Mar 2012 09:47:59 +0000 (10:47 +0100)
committer David Sarrut <david.sarrut@gmail.com>
Thu, 1 Mar 2012 09:47:59 +0000 (10:47 +0100)
diff --cc cmake/dependencies.cmake
Simple merge
diff --cc vv/CMakeLists.txt
Simple merge
author	David Sarrut <david.sarrut@gmail.com>
	Thu, 1 Mar 2012 09:47:59 +0000 (10:47 +0100)
committer	David Sarrut <david.sarrut@gmail.com>
	Thu, 1 Mar 2012 09:47:59 +0000 (10:47 +0100)
		1	2
cmake/dependencies.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
vv/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history