From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Fri, 20 May 2011 07:16:08 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.2.1~4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e364f427e4e9076da84e8d7c094fe341d5cfafd1;hp=8a1140e4a66617146b6209d5dfa250dfd09a89ee;p=clitk.git

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

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 81fbf60..d479cf0 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -115,12 +115,10 @@ QT4_WRAP_CPP(vv_SRCS
   vvStructureSetActor.h
   vvROIActor.h
   vvToolCreatorBase.h
-  vvRegisterForm.h
   )
 
 QT4_WRAP_UI(vv_UI_CXX 
   qt_ui/vvHelpDialog.ui 
-  qt_ui/vvRegisterForm.ui 
   qt_ui/vvDocumentation.ui 
   qt_ui/vvDicomSeriesSelector.ui 
   qt_ui/vvDummyWindow.ui #For testing
diff --git a/vv/qt_ui/vvRegisterForm.ui b/vv/qt_ui/vvRegisterForm.ui
index 090cce0..f6b22c2 100644
--- a/vv/qt_ui/vvRegisterForm.ui
+++ b/vv/qt_ui/vvRegisterForm.ui
@@ -14,7 +14,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>VV registration</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">