Merge remote-tracking branch 'origin/master' into slint-cnes 12/18012/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 30 Mar 2016 14:36:03 +0000 (16:36 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 30 Mar 2016 14:36:03 +0000 (16:36 +0200)
commita65e23197c05b5fd2438829f71e15e1959f6c34d
tree37e815a1b302d018258fefe5693f9bed50e8d6ae
parent900cad6e43579a90ace1a178767579abeab2dc1e
parentb13d1c10e05dd55ff38b66aa2eab546316c63635
Merge remote-tracking branch 'origin/master' into slint-cnes

Change-Id: I66a4e1db9afa501d674a177635c2d6f838e7baff
39 files changed:
scilab/modules/ast/src/cpp/parse/flex/scanscilab.ll
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc
scilab/modules/helptools/etc/MAIN_CHAPTERS
scilab/modules/slint/Makefile.am
scilab/modules/slint/Makefile.in
scilab/modules/slint/includes/FileException.hxx
scilab/modules/slint/includes/checkers/AllCheckers.hxx
scilab/modules/slint/includes/checkers/BreaksInLoopChecker.hxx
scilab/modules/slint/includes/checkers/DecimalChecker.hxx
scilab/modules/slint/includes/checkers/ExpInCondChecker.hxx
scilab/modules/slint/includes/checkers/LineLengthChecker.hxx
scilab/modules/slint/includes/checkers/SLintChecker.hxx
scilab/modules/slint/includes/checkers/SemicolonAtEOLChecker.hxx
scilab/modules/slint/includes/checkers/VariablesChecker.hxx
scilab/modules/slint/includes/config/XMLConfig.hxx
scilab/modules/slint/includes/output/SLintResult.hxx
scilab/modules/slint/includes/output/SLintScilabResult.hxx
scilab/modules/slint/includes/output/SLintXmlResult.hxx
scilab/modules/slint/sci_gateway/cpp/sci_slint.cpp
scilab/modules/slint/slint.iss
scilab/modules/slint/src/cpp/BracketedExpChecker.cpp
scilab/modules/slint/src/cpp/BreaksInLoopChecker.cpp
scilab/modules/slint/src/cpp/DecimalChecker.cpp
scilab/modules/slint/src/cpp/ExpInCondChecker.cpp
scilab/modules/slint/src/cpp/FileException.cpp
scilab/modules/slint/src/cpp/FunctionTestReturnChecker.cpp
scilab/modules/slint/src/cpp/ImplicitListChecker.cpp
scilab/modules/slint/src/cpp/LineLengthChecker.cpp
scilab/modules/slint/src/cpp/LoadSaveChecker.cpp
scilab/modules/slint/src/cpp/NestedBlocksChecker.cpp
scilab/modules/slint/src/cpp/SLint.cpp
scilab/modules/slint/src/cpp/SLintChecker.cpp
scilab/modules/slint/src/cpp/SLintScilabResult.cpp
scilab/modules/slint/src/cpp/SLintVisitor.cpp
scilab/modules/slint/src/cpp/SLintXmlResult.cpp
scilab/modules/slint/src/cpp/SciFile.cpp
scilab/modules/slint/src/cpp/VariablesChecker.cpp
scilab/modules/slint/src/cpp/XMLConfig.cpp