Merge remote-tracking branch 'origin/master' into yasp 06/12306/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 20 Aug 2013 05:42:24 +0000 (07:42 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 20 Aug 2013 05:42:24 +0000 (07:42 +0200)
commitf4b9ebe5841e3dc34e8038fd34a6d5695d4b4d52
treea5ef75418e98f39b787f6ca84576d7aca3ef4c80
parent5a8d098add4b3e5343f60f06c9166fc02faf1301
parent9f8f7ae710d16b1a98c7d7bc1f458010c0781144
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/modules/differential_equations/src/fortran/xerrwv.f

Change-Id: I12174ba60551ee79f1fdda85aa3d9c43c7f1f62a
scilab/modules/differential_equations/src/fortran/xerrwv.f