no message

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index 695b00d5fd45d9686065fa56b2d08d67a65f14c4..f66f2a54006d6c6e867fd9558f4ddd112a3d73ea 100644 (file)
--- 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 c74f844c84c929e54f0ad646d9e110238b946641..235558e02623308fe0f6229836b4859b8246f6d0 100755 (executable)
--- 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