summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
AgeCommit message (Collapse)AuthorFilesLines
2010-04-13Merge commit 'origin/5.2'Pierre MARECHAL1-1/+1
Conflicts: scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci Change-Id: I629a8ab712ad71e42fac6d4e140fbcb75250b896
2010-04-13Update of the localization templatesSylvestre Ledru1-1/+1
Change-Id: I53206ae3a6f66ff5eb9756d89e72b4760c2815f9
2010-04-09Merge commit 'origin/5.2'Pierre MARECHAL1-0/+1
2010-04-08Some macros were duplicated during the installation process.Sylvestre Ledru1-0/+1
Change-Id: I513fb3ac83f002982b90db22d863c99b979801d1
2010-02-26compatibility dll versioning and VS expressAllan CORNET2-15/+1
2010-02-18force UTF-8 encoding for vcprojAllan CORNET3-3/+3
2010-02-12merge with masterAllan CORNET1-0/+1
2010-02-12remove not used file in .issAllan CORNET1-2/+0
2010-02-12Merge remote branch 'origin/master' into textrenderingSylvestre Ledru1-0/+1
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
2010-02-12regeneration of Makefile.inSylvestre Ledru1-1/+1
2010-02-12%helps_module defined only when we needAllan CORNET2-10/+0
2010-02-04Merge branch '5.2'Clément DAVID1-0/+1
Conflicts: scilab/configure scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/ViewPaletteBrowserAction.java
2010-02-04regenerated of autotools due to previous commitSylvestre Ledru1-0/+1
2010-02-03Merge branch '5.2'Clément DAVID1-1/+2
Conflicts: scilab/configure scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java
2010-02-03* When two versions of the same jar libraries, in some cases, the systemSylvestre Ledru1-1/+2
could not detect any of them
2010-02-02Merge commit 'origin/5.2'Pierre MARECHAL1-1/+0
Conflicts: scilab/configure
2010-02-02autoreconfPierre MARECHAL1-1/+0
2010-02-02Merge remote branch 'origin/master' into textrenderingSylvestre Ledru4-6/+10
Conflicts: scilab/configure
2010-01-31regeneration of Makefile.inSylvestre Ledru1-0/+4
2010-01-26regenerated autotools files regarding jlatexmath-fop stuffSylvestre Ledru1-0/+1
2010-01-26Merge branch 'master' of git.scilab.org:scilabAllan CORNET3-5/+36
2010-01-26remove /ARCH:IA32 limitationAllan CORNET3-6/+6
2010-01-25Merge commit 'origin/5.2'Vincent Couvert2-4/+35
2010-01-25bug 6491 fixed - libinter.h was not installed under Linux (SEP #35 updated)Sylvestre Ledru2-4/+35
2010-01-25Merge remote branch 'origin/5.2'Yann Collette1-1/+1
2010-01-25Regenerated localization template due to fixed typosSylvestre Ledru1-1/+1
2010-01-11Merge branch '5.2'Clément DAVID1-1/+2
2010-01-11* Under GNU/Linux, Mac OS X & Unix, a m4 macro calledSylvestre Ledru1-1/+2
AC_JAVA_CHECK_VERSION_PACKAGE has been added to check the version of Java packages used The first use of this feature is too check the version jgraphx which should be 1.2.0.X Note that this commit will make the compilation fails under Clement pushes his changes.
2010-01-04Merge commit 'refs/remotes/origin/5.2'Allan CORNET1-9/+0
2010-01-04bug 5699Allan CORNET1-9/+0
2010-01-04Merge remote branch 'refs/remotes/origin/5.2'Allan CORNET1-1/+1
2010-01-042010Allan CORNET1-1/+1
2009-12-10Merge remote branch 'origin/5.2'Yann Collette1-1/+1
2009-12-10Update of the localization templatesSylvestre Ledru1-1/+1
2009-11-17Flush of all templatesPierre MARECHAL1-1/+1
2009-11-17Merge commit 'origin/5.2'Pierre MARECHAL1-1/+1
2009-11-09Merge commit 'refs/remotes/origin/5.2'Allan CORNET1-1/+1
2009-11-09Flush of all templatesSylvestre Ledru1-1/+1
2009-11-09Flush of all templatesSylvestre Ledru1-1/+1
2009-11-05dlls versionAllan CORNET1-4/+4
2009-11-04MODULES : version.xml, Scilab 5.3Pierre MARECHAL1-1/+1
2009-11-04MODULES : homogenize version.xml files5.2.0-beta-1Pierre MARECHAL1-22/+5
2009-11-03bug 5155 - scilab windows with old CPUsAllan CORNET3-2/+10
2009-10-27Regenrate localization templates with *.sceSylvestre Ledru1-1/+1
2009-10-25Regenerate template localisation files with the sortingSylvestre Ledru1-1/+1
2009-10-20English localization template updatedSylvestre Ledru1-1/+1
2009-10-12Merge commit 'origin/master' into XcosVincent COUVERT1-0/+1
Conflicts: scilab/configure
2009-10-12Merge of the textrendering branch into the masterSylvestre Ledru1-0/+1
2009-10-08Merge commit 'origin/master' into XcosPierre MARECHAL1-5/+10
Conflicts: scilab/Version.incl scilab/configure scilab/modules/Makefile.in scilab/modules/core/includes/version.h
2009-10-07AutoreconfPierre MARECHAL1-1/+0