Merge remote-tracking branch 'origin/5.4' 38/10538/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 19 Feb 2013 14:19:57 +0000 (15:19 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 19 Feb 2013 14:19:57 +0000 (15:19 +0100)
commit12f44ae6250e895bf77b2503fd24dde03b845a6c
treeadf8805a67da28180bdccc33d5e1e7bb7cb1d98c
parent2cad473c19251deb8660d8470cdb8a7c06055d74
parentdb4e42ee491e5541180d0c5d4a032a06921fa8f4
Merge remote-tracking branch 'origin/5.4'

Conflicts:
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java

Change-Id: If25138032e14a2fe8578d687f802fd3b8c198bce
scilab/CHANGES_5.4.X
scilab/modules/core/Makefile.in
scilab/modules/external_objects/src/cpp/import.cpp
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java