summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
AgeCommit message (Collapse)AuthorFilesLines
2010-04-20Merge commit 'origin/5.2'Pierre MARECHAL11-21/+24
Conflicts: scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c Change-Id: I2baffdab5b8100dde645c111804d9453ed018906
2010-04-16Update of localization files in all Scilab supported languagesSylvestre Ledru11-21/+24
Change-Id: Idd8ae314c618516fb6b19abc8dda8dd004858da7
2010-04-14version.xml file: scilab-5.2.2Pierre MARECHAL1-2/+2
Change-Id: I3fa687d4349437f518e2baac1345235d80058ad1
2010-04-13Merge commit 'origin/5.2'Pierre MARECHAL1-7/+7
Conflicts: scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci Change-Id: I629a8ab712ad71e42fac6d4e140fbcb75250b896
2010-04-13Update of the localization templatesSylvestre Ledru1-7/+7
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/+2
Change-Id: I513fb3ac83f002982b90db22d863c99b979801d1
2010-04-08fix exit on macosAllan CORNET1-2/+4
2010-04-07remove wrong symbolAllan CORNET1-1/+2
2010-04-02Merge commit 'origin/5.2'Pierre MARECHAL2-9/+14
2010-04-02* bug 5700 fixed - Compilation under RHE4 was failing on term.h and termcap.hNicolas Vergnes2-9/+14
inclusion. Thanks to Nicolas Vergnes for providing the fix.
2010-04-01Merge commit 'origin/5.2'Pierre MARECHAL1-0/+1
Conflicts: scilab/configure
2010-03-30Merge remote branch 'origin/5.2'Sylvestre Ledru2-18/+18
2010-03-30Under Mac OS X, add the option -msse2 while building the shell module. It ↵Sylvestre Ledru2-18/+18
fixes the build error described in bug #6839
2010-03-18Merge commit 'origin/5.2'Clément DAVID1-16/+22
Conflicts: scilab/modules/scicos/macros/scicos_scicos/bad_connection.sci
2010-03-16identationSylvestre Ledru1-16/+22
2010-03-16Merge remote branch 'origin/5.2'Sylvestre Ledru1-6/+5
2010-03-16Highlight the fact that the option -nwni and -nogui are the sameSylvestre Ledru1-6/+5
2010-02-26compatibility dll versioning and VS expressAllan CORNET2-15/+1
2010-02-18force UTF-8 encoding for vcprojAllan CORNET2-2/+2
2010-02-15Merge remote branch 'origin/5.2'Sylvestre Ledru10-10/+10
Conflicts: scilab/CHANGES_5.2.X scilab/configure scilab/configure.ac scilab/etc/classpath.xml.vc scilab/m4/docbook.m4 scilab/modules/graphics/graphics.iss scilab/scilab-lib.properties.vc
2010-02-15Update of the localizationSylvestre Ledru10-10/+10
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 Ledru2-1/+3
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-03Merge branch '5.2'Clément DAVID1-1/+2
2010-02-03this wan't supposed to be commitedSylvestre Ledru1-4/+1
2010-02-03Merge branch '5.2' of git.scilab.org:scilab into 5.2Sylvestre Ledru1-1/+0
2010-02-03* With the option --texmacs, the mode NWNI was used. It has been changed to NWSylvestre Ledru1-2/+6
to allow the use of graphic features.
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 Ledru2-2/+6
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 CORNET1-2/+2
2010-01-26remove /ARCH:IA32 limitationAllan CORNET1-2/+2
2010-01-25Merge remote branch 'origin/5.2'Yann Collette1-2/+2
2010-01-25Regenerated localization template due to fixed typosSylvestre Ledru1-2/+2
2010-01-22Merge remote branch 'refs/remotes/origin/5.2'Allan CORNET1-0/+87
2010-01-21Ukrainian localizationYuri Chornoivan1-0/+87
2010-01-11Merge branch '5.2'Clément DAVID1-1/+2
2010-01-11Merge branch '5.2' of git.scilab.org:scilab into 5.2Sylvestre Ledru1-11/+18
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-11Merge remote branch 'refs/remotes/origin/5.2'Allan CORNET1-11/+18