Merge remote-tracking branch 'origin/master' into YaSp 92/10192/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 11 Jan 2013 09:05:18 +0000 (10:05 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 11 Jan 2013 09:05:18 +0000 (10:05 +0100)
commitd57a2004e4abc482816fad9ca6a20da153c4ec4e
tree527e33ea63a224726ec4fe67a1d7d42f2ed8b7e1
parent937cee13551a7201e43c22873c703dde39b0ca94
parentb23dc35930512dd40755d520c543364778d83c51
Merge remote-tracking branch 'origin/master' into YaSp

Change-Id: I0b5b271489da7b6e64b82e505448c82835712aee
scilab/modules/commons/src/c/core_Import.def
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c