Merge remote-tracking branch 'origin/master' into yasp 11/14411/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 14 Apr 2014 12:37:00 +0000 (14:37 +0200)
committerCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Mon, 14 Apr 2014 13:02:40 +0000 (15:02 +0200)
commitc449fa8755e9553b1121c6ca332d92b3eb2ca99d
treee739cb8b2adbea57d0fed3806e33bbb0ec649538
parent3644a18a90167bb1bb731d765dcf652a65f90efe
parent2f38532f82da0ebdee5f2b42b5f7591735f386b2
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/Makefile.in
scilab/modules/core/src/c/tmpdir.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html

Change-Id: I9870d20ea0ccdd1605e5ea88d5b112842c7c0251
12 files changed:
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/fftw/sci_gateway/c/sci_fftw_forget_wisdom.c
scilab/modules/fileio/src/c/copyfile_windows.c
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/gui/sci_gateway/c/sci_figure.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/cpp/sci_saveGui.cpp
scilab/modules/spreadsheet/src/c/ripole/ole.c