Merge remote-tracking branch 'origin/5.4' 89/10689/1
Sylvestre Ledru [Tue, 5 Mar 2013 08:19:15 +0000 (09:19 +0100)]
Conflicts:
SEP/INDEX

Change-Id: I77e9e04edc90feb87c03f907c44fc3138568fda9

1  2 
SEP/INDEX
scilab/CHANGES_5.4.X

diff --cc SEP/INDEX
+++ b/SEP/INDEX
@@@ -84,4 -84,5 +84,5 @@@ SEP #084: fft improvement
  SEP #085: cond improvements
  SEP #086: Improvement of the regexp function
  SEP #087: New binaries: xcos scinotes
- SEP #088: Remote file access functions
 -SEP #088: /* RESERVED IN MASTER */
++SEP #088: Remote file access functions
+ SEP #089: New parameter added at routh_t function (normalized).
Simple merge