From a19dd400a71fc95b4f264aa9f1d6f976717a22d5 Mon Sep 17 00:00:00 2001
From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 2 Oct 2009 16:34:45 +0000
Subject: [PATCH] no message

---
 appli/creaNewProject/creaNewProject.cpp   | 4 ++++
 appli/creaNewProject/creaNewProject.sh.in | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index 695b00d..f66f2a5 100644
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -35,9 +35,13 @@ bool myApp::OnInit( )
 #else
    std::string command("creaNewProject.sh ");
 #endif
+<<<<<<< creaNewProject.cpp
+   command += "\"" + crea::wx2std(dir) + "\"" +" " + crea::wx2std(name);
+=======
    command += "\"" + crea::wx2std(dir) + "\" \"" + crea::wx2std(name) + "\"";
    command1 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\" " + "PROJECT_NAME " + crea::wx2std(name) + "> \"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt\"";
    command2 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\"";
+>>>>>>> 1.3
 
    if ( ! system ( command.c_str() ) )
      {
diff --git a/appli/creaNewProject/creaNewProject.sh.in b/appli/creaNewProject/creaNewProject.sh.in
index c74f844..235558e 100755
--- a/appli/creaNewProject/creaNewProject.sh.in
+++ b/appli/creaNewProject/creaNewProject.sh.in
@@ -16,10 +16,10 @@ INPUT=${BINPATH}/creaNewProject_data
 OUTPUT=$1
 PROJECT=$2
 
-#echo "output = " $OUTPUT
-#echo "bin    = " $BINPATH
-#echo "input  = " $INPUT
-#echo "project= " $PROJECT
+echo "output = " $OUTPUT
+echo "bin    = " $BINPATH
+echo "input  = " $INPUT
+echo "project= " $PROJECT
 
 if [ -d $OUTPUT/${PROJECT} ] 
     then 
-- 
2.45.1