Merge remote-tracking branch 'origin/master' into yasp 57/10857/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 15 Mar 2013 14:26:49 +0000 (15:26 +0100)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 15 Mar 2013 15:37:30 +0000 (16:37 +0100)
commitb030b9cc50814ea745533e13f98c9a9ddcd72b1c
tree80c746f3c5553679af14aa1c5aadd8fdfae14cc6
parent05f1c61457c9511da6cb41914f9c779ac7743ad1
parent60961d448a16a98e4ce8236361038d5f3736ce62
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/modules/atoms/tests/unit_tests/atomsRemove.tst
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/localization/src/c/tableslanguages.h

Change-Id: I2dc6c0c7c4556cf254dee9658b0a0420af6693b0
scilab/modules/atoms/tests/unit_tests/atomsIsLoaded.tst
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/ScilabImageConverter.java
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/localization/src/c/tableslanguages.h