Merge remote-tracking branch 'origin/master' into gsoc2012-scilab

Conflicts: Examples/Makefile.in
2013-08-06 10:06:31 +02:00 · 2013-08-06 10:06:31 +02:00 · 21e17eaa73
commit 21e17eaa73
parent 6735b9727f 8e89cad271
795 changed files with 16905 additions and 11792 deletions
--- a/Examples/octave/variables/example.c
+++ b/Examples/octave/variables/example.c
@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include "example.h"

-int              ivar = 0;                    
+int              ivar = 0;
 short            svar = 0;
 long             lvar = 0;
 unsigned int     uivar = 0;