Merge commit 'refs/remotes/origin/5.1' into atoms
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Sun, 8 Mar 2009 21:36:53 +0000 (22:36 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Sun, 8 Mar 2009 21:36:53 +0000 (22:36 +0100)
commitf967697a41575cd946419cc45bff2da5f72830a6
treea389e78e0a2ec8ff1a1c263a0da572501a794690
parent006335d6c998c8fc04849a804e3dc0f835f24b85
parent222c3fc162897aa15eaa9f1b67bb81087b40570e
Merge commit 'refs/remotes/origin/5.1' into atoms

Conflicts:

scilab/Version.incl
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/includes/version.h
scilab/Version.incl
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/version.h