diff options
author | Clément DAVID <clement.david@scilab.org> | 2011-03-07 10:25:41 +0100 |
---|---|---|
committer | Clément DAVID <clement.david@scilab.org> | 2011-03-07 10:37:10 +0100 |
commit | 1de9fa2f978a5820f818b48d9d500af204ec9da8 (patch) | |
tree | 403a34f945586a452106e0d83784584440feb6da /SEP | |
parent | 2835e08091d79405f8a4ef74787b5aace3e935ab (diff) | |
parent | 77dd731c7106bcb6043a597c9bade2a12c11d1fe (diff) | |
download | scilab-1de9fa2f978a5820f818b48d9d500af204ec9da8.zip scilab-1de9fa2f978a5820f818b48d9d500af204ec9da8.tar.gz |
Merge remote-tracking branch 'origin/5.3' into simulinkimport
Conflicts:
scilab/Makefile.in
scilab/aclocal.m4
scilab/build.incl.xml
scilab/configure
scilab/contrib/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
Change-Id: I7fc05b70adca908a233ce3c191516df161cebf1e
Diffstat (limited to 'SEP')
-rw-r--r-- | SEP/INDEX | 3 | ||||
-rw-r--r-- | SEP/SEP_49_repmat.odt | bin | 0 -> 15294 bytes | |||
-rw-r--r-- | SEP/SEP_50_Xcos_Help_Folder.odt | bin | 0 -> 25512 bytes | |||
-rw-r--r-- | SEP/SEP_51_Linear_Programming.odt | bin | 0 -> 24211 bytes |
4 files changed, 3 insertions, 0 deletions
@@ -45,3 +45,6 @@ SEP #45 : Xcos palette management | |||
45 | SEP #46 : sum/cumsum/prod/cumprod revision | 45 | SEP #46 : sum/cumsum/prod/cumprod revision |
46 | SEP #47 : Scilab Desktop | 46 | SEP #47 : Scilab Desktop |
47 | SEP #48 : Scilab Preferences | 47 | SEP #48 : Scilab Preferences |
48 | SEP #49 : repmat function | ||
49 | SEP #50 : Xcos Help Folders | ||
50 | SEP #51 : Linear Programming \ No newline at end of file | ||
diff --git a/SEP/SEP_49_repmat.odt b/SEP/SEP_49_repmat.odt new file mode 100644 index 0000000..3acc2ce --- /dev/null +++ b/SEP/SEP_49_repmat.odt | |||
Binary files differ | |||
diff --git a/SEP/SEP_50_Xcos_Help_Folder.odt b/SEP/SEP_50_Xcos_Help_Folder.odt new file mode 100644 index 0000000..d086fc8 --- /dev/null +++ b/SEP/SEP_50_Xcos_Help_Folder.odt | |||
Binary files differ | |||
diff --git a/SEP/SEP_51_Linear_Programming.odt b/SEP/SEP_51_Linear_Programming.odt new file mode 100644 index 0000000..5c17223 --- /dev/null +++ b/SEP/SEP_51_Linear_Programming.odt | |||
Binary files differ | |||