Merge remote-tracking branch 'origin/master' into YaSp 15/16315/3
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Apr 2015 15:23:47 +0000 (17:23 +0200)
committerCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Thu, 2 Apr 2015 15:50:08 +0000 (17:50 +0200)
commitad94113ff45c78764aaf9559f79fcc4a36d9de9d
tree3dfd0c9c3b9a79cc4776b488236c717dea7b17d2
parentad0c1e990bddb76e58946fea87fad78e22b90ae7
parent22c40dc99526e82339e6dad9a9cfed759c1d2d58
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/cacsd/sci_gateway/c/sci_ricc2.c
scilab/modules/cacsd/tests/nonreg_tests/bug_9836.win.dia.ref
scilab/modules/fileio/sci_gateway/c/sci_mfprintf.c
scilab/modules/fileio/src/c/mputl.c
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/optimization/tests/nonreg_tests/bug_12702.win.dia.ref
scilab/modules/optimization/tests/nonreg_tests/bug_9690.win.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_8031.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_8031.tst

Change-Id: I7b6928f6c041d1c8ca3a839b34a5370b5dc6f752
21 files changed:
scilab/modules/cacsd/sci_gateway/c/sci_ricc.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/fileio/locales/fileio.pot
scilab/modules/fileio/sci_gateway/cpp/sci_mfprintf.cpp
scilab/modules/fileio/src/c/createdirectory.c
scilab/modules/fileio/src/cpp/mputl.cpp
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/sci_gateway/c/sci_drawaxis.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_plot3d.c
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.cpp
scilab/modules/graphics/sci_gateway/cpp/sci_contour2dm.cpp
scilab/modules/hdf5/src/cpp/H5DataFactory.cpp
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/statistics/tests/nonreg_tests/bug_8031.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_8031.tst