Merge remote-tracking branch 'origin/master' into YaSp 21/4621/1
authorVincent COUVERT <vincent.couvert@scilab.org>
Thu, 28 Jul 2011 08:04:41 +0000 (10:04 +0200)
committerVincent COUVERT <vincent.couvert@scilab.org>
Thu, 28 Jul 2011 08:04:41 +0000 (10:04 +0200)
commit449dd71388bc61bde68a05206b144566a2948114
tree8778a960253cb920911c7cde5918ecf09e1d62d8
parentcf91fc46518b6fcf28e89ff203814ab7a788ff5d
parent747eceb06057f4f2cd33111da2559b4a7aad5268
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/LibScilab_Import.def
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java

Change-Id: Iadc71588bd222a2395a07e95cf64ba9d1ba0b8d6
13 files changed:
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/dynamic_link/src/scripts/Makefile.incl.mak
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/LibScilab_Import.def
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/special_functions/src/c/special_functions.vcxproj.filters
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
scilab/modules/types/tests/java/org/scilab/tests/modules/types/testEquals.java