Merge remote-tracking branch 'origin/master' into YaSp 02/8502/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 2 Aug 2012 16:44:43 +0000 (18:44 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 2 Aug 2012 16:44:58 +0000 (18:44 +0200)
commit73891cf83d367c0181df2564aad8741d26cc9629
tree00ad15c4c09bc9f6d047efaea6a0157c8bf2426d
parent601ea6d011f42313f787f4f35be0c5c7a6b41e81
parentff34a9db9ea4b3cd04ea5f8bbb1b8c19a973838b
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/api_scilab/includes/api_common.h
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/core/src/c/banier.c
scilab/modules/fftw/sci_gateway/c/sci_fftw.c
scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/images/icons/aboutscilab.png
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html

Change-Id: I8b7556ffa696ac58d4ac39b11b38641b41689a22
35 files changed:
scilab/bin/scilab
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/modules/api_scilab/includes/api_common.h
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/fftw/sci_gateway/c/sci_fftw.c
scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj
scilab/modules/graphics/src/c/InitObjects.c
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/sci_gateway/c/sci_mpopup.c
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/renderer/renderer.iss
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c