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

author Benoît Presles <benoit.presles@netcourrier.com>

Tue, 23 Oct 2012 17:02:58 +0000 (19:02 +0200)

committer Benoît Presles <benoit.presles@netcourrier.com>

Tue, 23 Oct 2012 17:02:58 +0000 (19:02 +0200)
author Benoît Presles <benoit.presles@netcourrier.com>
Tue, 23 Oct 2012 17:02:58 +0000 (19:02 +0200)
committer Benoît Presles <benoit.presles@netcourrier.com>
Tue, 23 Oct 2012 17:02:58 +0000 (19:02 +0200)
diff --cc vv/CMakeLists.txt
Simple merge
diff --cc vv/vvMainWindow.cxx
Simple merge
diff --cc vv/vvSlicer.cxx
Simple merge
author	Benoît Presles <benoit.presles@netcourrier.com>
	Tue, 23 Oct 2012 17:02:58 +0000 (19:02 +0200)
committer	Benoît Presles <benoit.presles@netcourrier.com>
	Tue, 23 Oct 2012 17:02:58 +0000 (19:02 +0200)
		1	2
vv/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
vv/vvMainWindow.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
vv/vvSlicer.cxx	patch \|	diff1 \|	diff2 \|	blob \| history