Merge remote branch 'origin/master' into MPI
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Mon, 25 Jan 2010 16:28:30 +0000 (17:28 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Mon, 25 Jan 2010 16:28:30 +0000 (17:28 +0100)
commitd65c6a978f0e93da53a6813f2a56158b17f95ee6
tree88a6a1522ebfa786f85ba01c8d9f3dd4833b6570
parent76e827758b42639bf703fbfb336de7cadc0e91db
parent1c956672c8556c535bb93ace3c3df624c2672f9d
Merge remote branch 'origin/master' into MPI

Conflicts:
scilab/Version.incl
scilab/configure
scilab/modules/core/includes/version.h
scilab/Makefile.in
scilab/Version.incl
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/modules/core/Makefile.in
scilab/modules/core/includes/version.h
scilab/modules/intersci/Makefile.in