Faulty configuration files fixed 69/269/1
Manuel Juliachs [Mon, 26 Apr 2010 13:22:51 +0000 (15:22 +0200)]
Change-Id: If7ce5cbf4f6bb354ad7072caabf5f8927c5d4a3d

scilab/build.incl.xml
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

index ad1d0ed..75bf4f9 100644 (file)
@@ -65,6 +65,7 @@
        <path id="compile.classpath">
                <pathelement location="${library.types.dir}/${library.types.name}"/>
                <pathelement location="${library.graph.dir}/${library.graph.name}"/>
+               <pathelement location="${library.graphic_objects.dir}/${library.graphic_objects.name}"/>
                <pathelement location="${library.xcos.dir}/${library.xcos.name}"/>
                <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/>
                <pathelement location="${library.xpad.dir}/${library.xpad.name}"/>
index 1f8be95..1498abf 100644 (file)
@@ -84,11 +84,9 @@ library.xcos.name=org.scilab.modules.xcos.jar
 library.xpad.dir=${modules.dir}/xpad/${build.jar.dir}/
 library.xpad.name=org.scilab.modules.xpad.jar
 
-<<<<<<< HEAD
 library.graphic_objects.dir=${modules.dir}/graphic_objects/${build.jar.dir}/
 library.graphic_objects.name=org.scilab.modules.graphic_objects.jar
-=======
+
 library.graph.dir=${modules.dir}/graph/${build.jar.dir}/
 library.graph.name=org.scilab.modules.graph.jar
 
->>>>>>> refs/remotes/origin/master
index 6b260c4..edd0ee0 100644 (file)
@@ -83,11 +83,9 @@ library.xcos.name=org.scilab.modules.xcos.jar
 library.xpad.dir=${modules.dir}/xpad/${build.jar.dir}/
 library.xpad.name=org.scilab.modules.xpad.jar
 
-<<<<<<< HEAD
 library.graphic_objects.dir=${modules.dir}/graphic_objects/${build.jar.dir}/
 library.graphic_objects.name=org.scilab.modules.graphic_objects.jar
-=======
+
 library.graph.dir=${modules.dir}/graph/${build.jar.dir}/
 library.graph.name=org.scilab.modules.graph.jar
 
->>>>>>> refs/remotes/origin/master