Merge branch '5.2' of git.scilab.org:scilab into 5.2
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Mon, 25 Jan 2010 16:29:29 +0000 (17:29 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Mon, 25 Jan 2010 16:29:29 +0000 (17:29 +0100)
commit3d0b710168db5c92249201b49e9c47bdeee3c201
tree3006bd40475ca3c27c9fcce9d38aff534b18b515
parent6e411670e232dfaa265ccc48c81439baf4d7949f
parent23ed6a16671ed9aab193928f0745511afb454bf0
Merge branch '5.2' of git.scilab.org:scilab into 5.2