merge with master (build windows)
authorAllan CORNET <allan.cornet@scilab.org>
Mon, 1 Feb 2010 14:18:32 +0000 (15:18 +0100)
committerAllan CORNET <allan.cornet@scilab.org>
Mon, 1 Feb 2010 14:18:32 +0000 (15:18 +0100)
commit48070c4b11a3a87b8ce6c29a1ea91468357209d8
treea7a9c719a827ed33c382121cb0fcad09bd035318
parent5b055aed5b0dedf18adb30a5ead58323337b8b96
parent70abca9ca35edfd048c34d96bd99258732516373
merge with master (build windows)
123 files changed:
scilab/CHANGES_5.2.X
scilab/modules/core/includes/version.h
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/dynamic_link/macros/ilib_for_link.sci
scilab/modules/graphics/macros/%h_load.sci
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/demos/Electrical/boost_conv.dem.sce
scilab/modules/scicos/demos/Electrical/bridge_rectifier.dem.sce
scilab/modules/scicos/demos/ModelicaBlocks/Transmission_Line.cosf
scilab/modules/scicos/demos/ModelicaBlocks/ball_platform.dem.sce
scilab/modules/scicos/demos/ModelicaBlocks/modelica_bouncing_ball.dem.sce
scilab/modules/scicos/demos/PENDULUM_ANIM.sci
scilab/modules/scicos/demos/bounce.dem.sce
scilab/modules/scicos/demos/bouncing_ball.dem.sce
scilab/modules/scicos/demos/cont_sys_disc_cont.dem.sce
scilab/modules/scicos/demos/demo_flipflop.dem.sce
scilab/modules/scicos/demos/demo_watertank.dem.sce
scilab/modules/scicos/demos/fibonacci.dem.sce
scilab/modules/scicos/demos/goto_demo.dem.sce
scilab/modules/scicos/demos/goto_from.dem.sce
scilab/modules/scicos/demos/if_scicos_block.dem.sce
scilab/modules/scicos/demos/inv_pend_anim.dem.sce
scilab/modules/scicos/demos/inverted_pend.dem.sce
scilab/modules/scicos/demos/kalman.dem.sce
scilab/modules/scicos/demos/simple_demo.dem.sce
scilab/modules/scicos/demos/table_lookup.dem.sce
scilab/modules/scicos/demos/temp_controller.dem.sce
scilab/modules/scicos/demos/zero_crossing.dem.sce
scilab/modules/scicos/etc/scicos.start
scilab/modules/scicos/help/en_US/palettes/matrix_pal/RICC.xml
scilab/modules/scicos/help/en_US/programming_scicos_blocks/c_computational_functions/C_struct.xml
scilab/modules/scicos/help/fr_FR/programming_scicos_blocks/c_computational_functions/C_struct.xml
scilab/modules/scicos/help/scicos_doc/man/eng/data_revB/data_desc.xml
scilab/modules/scicos/help/scicos_doc/man/fr/data_revB/data_desc.xml
scilab/modules/scicos/macros/scicos_auto/lincos.sci
scilab/modules/scicos/macros/scicos_auto/scicos.sci
scilab/modules/scicos/macros/scicos_menus/XcosMenuSaveAsInterfFunc.sci
scilab/modules/scicos/macros/scicos_scicos/FindSBParams.sci
scilab/modules/scicos/macros/scicos_scicos/c_pass2.sci
scilab/modules/scicos/macros/scicos_scicos/do_addnew.sci
scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci
scilab/modules/scicos/macros/scicos_scicos/do_doc.sci
scilab/modules/scicos/macros/scicos_scicos/do_grid.sci
scilab/modules/scicos/macros/scicos_scicos/do_ident.sci
scilab/modules/scicos/macros/scicos_scicos/do_label.sci
scilab/modules/scicos/macros/scicos_scicos/do_options.sci
scilab/modules/scicos/macros/scicos_scicos/do_palettes.sci
scilab/modules/scicos/macros/scicos_scicos/do_rename.sci
scilab/modules/scicos/macros/scicos_scicos/do_resize.sci
scilab/modules/scicos/macros/scicos_scicos/do_saveblockgui.sci
scilab/modules/scicos/macros/scicos_scicos/do_setup.sci
scilab/modules/scicos/macros/scicos_scicos/get_dynamic_lib_dir.sci
scilab/modules/scicos/macros/scicos_scicos/hilite_obj.sci
scilab/modules/scicos/macros/scicos_scicos/translator.sci
scilab/modules/scicos/macros/scicos_scicos/unhilite_obj.sci
scilab/modules/scicos/macros/scicos_utils/with_modelica_compiler.sci
scilab/modules/scicos/scicos.iss
scilab/modules/scicos/src/c/Scicos_blocks_f_Import.def
scilab/modules/scicos/src/c/noscicos/noscicos.vcproj
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj
scilab/modules/scicos/tests/unit_tests/PENDULUM_ANIM.sci
scilab/modules/scicos/tests/unit_tests/lincos.dia.ref
scilab/modules/scicos/tests/unit_tests/steadycos.dia.ref
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/includes/scicos_block.h
scilab/modules/scicos_blocks/macros/Branching/CLKGotoTagVisibility.sci
scilab/modules/scicos_blocks/macros/Branching/DEMUX.sci
scilab/modules/scicos_blocks/macros/Branching/GotoTagVisibility.sci
scilab/modules/scicos_blocks/macros/Branching/GotoTagVisibilityMO.sci
scilab/modules/scicos_blocks/macros/Branching/MUX.sci
scilab/modules/scicos_blocks/macros/Branching/M_SWITCH.sci
scilab/modules/scicos_blocks/macros/Branching/SELECT_m.sci
scilab/modules/scicos_blocks/macros/Branching/SWITCH2_m.sci
scilab/modules/scicos_blocks/macros/Electrical/Capacitor.sci
scilab/modules/scicos_blocks/macros/Electrical/Inductor.sci
scilab/modules/scicos_blocks/macros/Electrical/OpAmp.sci
scilab/modules/scicos_blocks/macros/Electrical/Resistor.sci
scilab/modules/scicos_blocks/macros/Events/IFTHEL_f.sci
scilab/modules/scicos_blocks/macros/Events/M_freq.sci
scilab/modules/scicos_blocks/macros/Hydraulics/Flowmeter.sci
scilab/modules/scicos_blocks/macros/Hydraulics/VanneReglante.sci
scilab/modules/scicos_blocks/macros/IntegerOp/JKFLIPFLOP.sci
scilab/modules/scicos_blocks/macros/IntegerOp/SRFLIPFLOP.sci
scilab/modules/scicos_blocks/macros/Linear/DIFF_c.sci
scilab/modules/scicos_blocks/macros/Linear/GAINBLK.sci
scilab/modules/scicos_blocks/macros/Linear/INTEGRAL_m.sci
scilab/modules/scicos_blocks/macros/Linear/PID.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATCATH.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATCATV.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATMUL.sci
scilab/modules/scicos_blocks/macros/Misc/CBLOCK.sci
scilab/modules/scicos_blocks/macros/Misc/CBLOCK4.sci
scilab/modules/scicos_blocks/macros/Misc/CONSTRAINT2_c.sci
scilab/modules/scicos_blocks/macros/Misc/CONSTRAINT_c.sci
scilab/modules/scicos_blocks/macros/Misc/DIFF_f.sci
scilab/modules/scicos_blocks/macros/Misc/DSUPER.sci
scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
scilab/modules/scicos_blocks/macros/Misc/MPBLOCK.sci
scilab/modules/scicos_blocks/macros/Misc/PENDULUM_ANIM.sci
scilab/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci
scilab/modules/scicos_blocks/macros/Misc/TEXT_f.sci
scilab/modules/scicos_blocks/macros/NonLinear/LOOKUP2D.sci
scilab/modules/scicos_blocks/macros/NonLinear/LOOKUP_c.sci
scilab/modules/scicos_blocks/macros/NonLinear/PRODUCT.sci
scilab/modules/scicos_blocks/macros/PDE/PDE.sci
scilab/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
scilab/modules/scicos_blocks/macros/Sources/Counter.sci
scilab/modules/scicos_blocks/macros/Sources/FROMWS_c.sci
scilab/modules/scicos_blocks/macros/Sources/GENSIN_f.sci
scilab/modules/scicos_blocks/macros/Sources/GEN_SQR.sci
scilab/modules/scicos_blocks/macros/Sources/PULSE_SC.sci
scilab/modules/scicos_blocks/macros/Sources/SLIDER_f.sci
scilab/modules/scicos_blocks/macros/Sources/STEP.sci
scilab/modules/scicos_blocks/scicos_blocks.iss
scilab/modules/scicos_blocks/src/c/affich.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/fromws_c.c
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj
scilab/modules/scicos_blocks/src/c/scoWindowScope.c
scilab/modules/scicos_blocks/src/cpp/affich2.cpp
scilab/modules/xcos/tests/unit_tests/PENDULUM_ANIM.sci