Merge remote-tracking branch 'upstream/gsoc2012-scilab' into gsoc2012…

…-scilab Conflicts: Source/Modules/scilab.cxx
swig · Sep 6, 2013 · 38750fd · 38750fd
2 parents c0cc7be + 4f66348
commit 38750fd
Show file tree

Hide file tree

Showing 3 changed files with 190 additions and 95 deletions.
diff --git a/Doc/Manual/Preprocessor.html b/Doc/Manual/Preprocessor.html
@@ -117,7 +117,7 @@ <H2><a name="Preprocessor_condition_compilation"></a>7.3 Conditional Compilation
 SWIGJAVA                        Defined when using Java
 SWIGLUA                         Defined when using Lua
 SWIGMODULA3                     Defined when using Modula-3
-SWIGMZSCHEME                    Defined when using Mzscheme        
+SWIGMZSCHEME                    Defined when using Mzscheme
 SWIGOCAML                       Defined when using Ocaml
 SWIGOCTAVE                      Defined when using Octave
 SWIGPERL                        Defined when using Perl
@@ -126,6 +126,7 @@ <H2><a name="Preprocessor_condition_compilation"></a>7.3 Conditional Compilation
 SWIGPYTHON                      Defined when using Python
 SWIGR                           Defined when using R
 SWIGRUBY                        Defined when using Ruby
+SWIGSCILAB                      Defined when using Scilab
 SWIGSEXP                        Defined when using S-expressions
 SWIGTCL                         Defined when using Tcl
 SWIGXML                         Defined when using XML