summaryrefslogtreecommitdiffstats
path: root/scilab/modules/output_stream
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-02-03 12:18:23 +0100
committerClément DAVID <clement.david@scilab.org>2010-02-03 12:18:23 +0100
commit335462d0ce79a7e8d961955fdee026c4d0d040b2 (patch)
tree40faa41d726279fbf74a29a1b3465a8079b0468d /scilab/modules/output_stream
parent3efa7732c0c216c19430280b488efbf8ea668856 (diff)
parent667525c7fdb7cadc0b7e5e8b03762cba1257a3fa (diff)
downloadscilab-335462d0ce79a7e8d961955fdee026c4d0d040b2.zip
scilab-335462d0ce79a7e8d961955fdee026c4d0d040b2.tar.gz
Merge branch '5.2'
Conflicts: scilab/configure scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java
Diffstat (limited to 'scilab/modules/output_stream')
-rw-r--r--scilab/modules/output_stream/Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index fe1a2371..87bdfc6 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11 from Makefile.am. 1# Makefile.in generated by automake 1.11.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -309,6 +309,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
309PACKAGE_NAME = @PACKAGE_NAME@ 309PACKAGE_NAME = @PACKAGE_NAME@
310PACKAGE_STRING = @PACKAGE_STRING@ 310PACKAGE_STRING = @PACKAGE_STRING@
311PACKAGE_TARNAME = @PACKAGE_TARNAME@ 311PACKAGE_TARNAME = @PACKAGE_TARNAME@
312PACKAGE_URL = @PACKAGE_URL@
312PACKAGE_VERSION = @PACKAGE_VERSION@ 313PACKAGE_VERSION = @PACKAGE_VERSION@
313PATH_SEPARATOR = @PATH_SEPARATOR@ 314PATH_SEPARATOR = @PATH_SEPARATOR@
314PCRE_CFLAGS = @PCRE_CFLAGS@ 315PCRE_CFLAGS = @PCRE_CFLAGS@