merge with master (to do : regenerate configure and modules/makefile.in just after)
Allan CORNET [Fri, 5 Mar 2010 12:23:48 +0000 (13:23 +0100)]
17 files changed:
1  2 
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure.ac
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/dynamic_link/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

@@@ -1048,29 -1048,19 +1048,35 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        ProjectSection(ProjectDependencies) = postProject
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
+       EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+               {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
        EndProjectSection
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects", "modules\graphic_objects\src\c\graphic_objects.vcproj", "{30F9EE41-587B-4618-8DE7-698D3FBA4985}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects-Ant", "modules\graphic_objects\src\java\graphic_objects-JAVA.vcproj", "{A3193DF3-A764-4B51-B240-9285289C337E}"
 +      ProjectSection(ProjectDependencies) = postProject
-               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
++              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 +              {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
 +              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
 +      EndProjectSection
 +EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
- EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|Win32.Build.0 = Release|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.ActiveCfg = Release|x64
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.Build.0 = Release|x64
- <<<<<<< HEAD:scilab/Scilab.sln
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|Win32.ActiveCfg = Debug|Win32
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|x64.ActiveCfg = Debug|x64
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.ActiveCfg = Release|Win32
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|x64.ActiveCfg = Release|x64
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|x64.ActiveCfg = Debug|x64
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.ActiveCfg = Release|Win32
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|x64.ActiveCfg = Release|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.Build.0 = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.ActiveCfg = Debug|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.Build.0 = Debug|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.ActiveCfg = Release|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.Build.0 = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.ActiveCfg = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.Build.0 = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.ActiveCfg = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.Build.0 = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.ActiveCfg = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.Build.0 = Release|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|Win32.Build.0 = Debug|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|x64.ActiveCfg = Debug|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|x64.Build.0 = Debug|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|Win32.ActiveCfg = Release|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|Win32.Build.0 = Release|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|x64.ActiveCfg = Release|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|x64.Build.0 = Release|x64
- =======
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|Win32.ActiveCfg = Debug|Win32
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|x64.ActiveCfg = Debug|x64
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.ActiveCfg = Release|Win32
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|x64.ActiveCfg = Release|x64
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|Win32.ActiveCfg = Debug|Win32
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|x64.ActiveCfg = Debug|x64
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.ActiveCfg = Release|Win32
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|x64.ActiveCfg = Release|x64
- >>>>>>> origin/master:scilab/Scilab.sln
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@@ -1049,29 -1049,19 +1049,34 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        ProjectSection(ProjectDependencies) = postProject
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
+       EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+               {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
        EndProjectSection
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects", "modules\graphic_objects\src\c\graphic_objects.vcproj", "{30F9EE41-587B-4618-8DE7-698D3FBA4985}"
 +      ProjectSection(ProjectDependencies) = postProject
-               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects-Ant", "modules\graphic_objects\src\java\graphic_objects-JAVA.vcproj", "{A3193DF3-A764-4B51-B240-9285289C337E}"
 +      ProjectSection(ProjectDependencies) = postProject
-               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
++              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 +              {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
 +              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
 +      EndProjectSection
 +EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
- EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|Win32.Build.0 = Release|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.ActiveCfg = Release|x64
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.Build.0 = Release|x64
- <<<<<<< HEAD:scilab/Scilab_f2c.sln
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|Win32.ActiveCfg = Debug|Win32
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|x64.ActiveCfg = Debug|x64
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.ActiveCfg = Release|Win32
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.Build.0 = Release|Win32
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|x64.ActiveCfg = Release|x64
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|x64.ActiveCfg = Debug|x64
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.ActiveCfg = Release|Win32
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.Build.0 = Release|Win32
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|x64.ActiveCfg = Release|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.Build.0 = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.ActiveCfg = Debug|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.Build.0 = Debug|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.ActiveCfg = Release|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.Build.0 = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.ActiveCfg = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.Build.0 = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.ActiveCfg = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.Build.0 = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.ActiveCfg = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.Build.0 = Release|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|Win32.Build.0 = Debug|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|x64.ActiveCfg = Debug|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|x64.Build.0 = Debug|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|Win32.ActiveCfg = Release|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|Win32.Build.0 = Release|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|x64.ActiveCfg = Release|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|x64.Build.0 = Release|x64
- =======
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|Win32.ActiveCfg = Debug|Win32
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|x64.ActiveCfg = Debug|x64
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.ActiveCfg = Release|Win32
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.Build.0 = Release|Win32
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|x64.ActiveCfg = Release|x64
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|Win32.ActiveCfg = Debug|Win32
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|x64.ActiveCfg = Debug|x64
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.ActiveCfg = Release|Win32
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.Build.0 = Release|Win32
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|x64.ActiveCfg = Release|x64
- >>>>>>> origin/master:scilab/Scilab_f2c.sln
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
Simple merge
@@@ -160,6 -160,7 +160,11 @@@ The option is "disableUnderMode" and ca
        <load on="Xpad"/>
  </path>
  
++
++<!-- TO DO Load only when we need -->
 +<path value="$SCILAB/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar"/>
 +
+ <!-- TO DO Load only when we need -->
+ <path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/>
  </classpaths>
@@@ -165,6 -165,7 +165,12 @@@ The option is "disableUnderMode" and ca
        <load on="Xpad"/>
  </path>
  
++
++<!-- TO DO Load only when we need -->
 +<path value="$SCILAB/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar"/>
 +
+ <!-- TO DO Load only when we need -->
+ <path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/>
++
  </classpaths>
@@@ -81,7 -81,8 +81,9 @@@
  <module name="hdf5" activate="yes"/>
  <module name="xcos" activate="@GUI_ENABLE@"/>
  <module name="xpad" activate="@GUI_ENABLE@"/>
 +<module name="graphic_objects" activate="@GUI_ENABLE@"/>
  <module name="api_scilab" activate="yes"/>
  <module name="helptools" activate="@HELP_ENABLE@"/>
+ <module name="graph" activate="@JAVA_ENABLE@"/>
  </modules>
@@@ -83,8 -83,8 +83,9 @@@
  <module name="hdf5" activate="yes"/>
  <module name="xcos" activate="yes"/>
  <module name="xpad" activate="yes"/>
 +<module name="graphic_objects" activate="yes"/>
  <module name="api_scilab" activate="yes"/>
  <module name="helptools" activate="yes"/>
+ <module name="graph" activate="yes"/>
  <!-- comments -->
  </modules>
@@@ -81,9 -81,9 +81,10 @@@ parameters 
  matio \
  atoms \
  hdf5 \
+ graph\
  xcos \
 -xpad 
 +xpad \
 +graphic_objects
  
  #umfpack
  
Simple merge
Simple merge
@@@ -81,5 -81,6 +81,11 @@@ library.xcos.name=org.scilab.modules.xc
  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
@@@ -80,5 -80,6 +80,11 @@@ library.xcos.name=org.scilab.modules.xc
  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