summaryrefslogtreecommitdiffstats
path: root/scilab/modules/signal_processing
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
commit10963c0a56109ddafb6f2f4a8dbdc925b00ac69c (patch)
tree9f8eefbac0a88917328855a3cf4c046f4e7ca719 /scilab/modules/signal_processing
parentbc7b15143690a57f6ee6d6ec9401227e77b18db4 (diff)
parentc8b337d77b6d3f040afc6a76b9c607a838ae62dd (diff)
downloadscilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.zip
scilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
Diffstat (limited to 'scilab/modules/signal_processing')
-rw-r--r--scilab/modules/signal_processing/Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index a87a301..25b8156 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -266,6 +266,7 @@ LD = @LD@
266LDFLAGS = @LDFLAGS@ 266LDFLAGS = @LDFLAGS@
267LIBICONV = @LIBICONV@ 267LIBICONV = @LIBICONV@
268LIBINTL = @LIBINTL@ 268LIBINTL = @LIBINTL@
269LIBM = @LIBM@
269LIBOBJS = @LIBOBJS@ 270LIBOBJS = @LIBOBJS@
270LIBS = @LIBS@ 271LIBS = @LIBS@
271LIBTOOL = @LIBTOOL@ 272LIBTOOL = @LIBTOOL@