summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-02-03 13:19:55 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-02-03 13:19:55 +0100
commitcd6c6ba3b30bae2b8e436e6729906c4377702aa5 (patch)
treee8b6bafbc151eee3cdd8bab8e93d54aedeaed225 /scilab/modules/scicos_blocks
parent5e8d152611e873148b9c969926226cd9c4eea3ee (diff)
parent335462d0ce79a7e8d961955fdee026c4d0d040b2 (diff)
downloadscilab-cd6c6ba3b30bae2b8e436e6729906c4377702aa5.zip
scilab-cd6c6ba3b30bae2b8e436e6729906c4377702aa5.tar.gz
Merge remote branch 'refs/remotes/origin/master' into scicos
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 6089aa0..d814f45 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/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,
@@ -775,6 +775,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
775PACKAGE_NAME = @PACKAGE_NAME@ 775PACKAGE_NAME = @PACKAGE_NAME@
776PACKAGE_STRING = @PACKAGE_STRING@ 776PACKAGE_STRING = @PACKAGE_STRING@
777PACKAGE_TARNAME = @PACKAGE_TARNAME@ 777PACKAGE_TARNAME = @PACKAGE_TARNAME@
778PACKAGE_URL = @PACKAGE_URL@
778PACKAGE_VERSION = @PACKAGE_VERSION@ 779PACKAGE_VERSION = @PACKAGE_VERSION@
779PATH_SEPARATOR = @PATH_SEPARATOR@ 780PATH_SEPARATOR = @PATH_SEPARATOR@
780PCRE_CFLAGS = @PCRE_CFLAGS@ 781PCRE_CFLAGS = @PCRE_CFLAGS@