Merge branch 'master' of /home/dsarrut/clitk3.server

author Romulo Pinho <pinho@lyon.fnclcc.fr>

Mon, 6 Jun 2011 12:40:03 +0000 (14:40 +0200)

committer Romulo Pinho <pinho@lyon.fnclcc.fr>

Mon, 6 Jun 2011 12:40:03 +0000 (14:40 +0200)
author Romulo Pinho <pinho@lyon.fnclcc.fr>
Mon, 6 Jun 2011 12:40:03 +0000 (14:40 +0200)
committer Romulo Pinho <pinho@lyon.fnclcc.fr>
Mon, 6 Jun 2011 12:40:03 +0000 (14:40 +0200)
diff --cc vv/vvMainWindow.cxx
Simple merge
diff --cc vv/vvSlicer.cxx
Simple merge
diff --cc vv/vvSlicerManager.cxx
Simple merge
author	Romulo Pinho <pinho@lyon.fnclcc.fr>
	Mon, 6 Jun 2011 12:40:03 +0000 (14:40 +0200)
committer	Romulo Pinho <pinho@lyon.fnclcc.fr>
	Mon, 6 Jun 2011 12:40:03 +0000 (14:40 +0200)
		1	2
vv/vvMainWindow.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
vv/vvSlicer.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
vv/vvSlicerManager.cxx	patch \|	diff1 \|	diff2 \|	blob \| history