projects / scilab.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e31969 41a8e1f) | patch
Merge remote-tracking branch 'origin/master' into YaSp
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 7 Aug 2012 08:09:32 +0000 (10:09 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 7 Aug 2012 08:11:38 +0000 (10:11 +0200)
commit5c22d46525a47a09a4efb40cc75dbe8791f73984
tree5241c8dac954e170ffcca763ba120c10698395c5tree | snapshot
parent6e31969923f7ff639b2e76c36a49bfcefeba4ee6commit | diff
parent41a8e1f91f0216c74e2a0c8e4e657a348311ce8acommit | diff
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/core/src/c/parse.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/linear_algebra/help/en_US/lsq.xml
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/scilab_windows/console.c

Change-Id: Id889cc2a966ca7241d2ab2e82611516c80e104ef
15 files changed:
scilab/contrib/Makefile.in diff1 | diff2 | blob | history
scilab/modules/console/src/c/cmdLine/getKey.c diff1 | diff2 | blob | history
scilab/modules/fileio/macros/%_listvarinfile.sci diff1 | diff2 | blob | history
scilab/modules/helptools/macros/xmltoformat.sci diff1 | diff2 | blob | history
scilab/modules/jvm/src/c/getJvmOptions.c diff1 | diff2 | blob | history
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp diff1 | diff2 | blob | history
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc diff1 | diff2 | blob | history
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc diff1 | diff2 | blob | history
scilab/modules/windows_tools/src/c/scilab_windows/console.c diff1 | diff2 | blob | history
scilab/modules/xml/sci_gateway/cpp/sci_xmlRead.cpp diff1 | diff2 | blob | history
scilab/modules/xml/sci_gateway/cpp/sci_xmlRemove.cpp diff1 | diff2 | blob | history
scilab/modules/xml/sci_gateway/cpp/sci_xmlSetAttributes.cpp diff1 | diff2 | blob | history
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidate.cpp diff1 | diff2 | blob | history
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidationFile.cpp diff1 | diff2 | blob | history
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp diff1 | diff2 | blob | history
Scilab official GIT repository