summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-01 15:39:39 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-01 15:39:39 +0200
commit3168c176002bcbb9431db4ae720caa114592721a (patch)
tree6036858845a8e29924106cb9833d71e38cb15545 /scilab/modules/shell
parent61e84f25e6f62f7b7ee6e593b07b496f9a0b592d (diff)
parent3d8f7fcc07395efe2269081a92ce748592df7996 (diff)
downloadscilab-3168c176002bcbb9431db4ae720caa114592721a.zip
scilab-3168c176002bcbb9431db4ae720caa114592721a.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/shell')
-rw-r--r--scilab/modules/shell/Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index ae6e2f8..d63837d 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -294,6 +294,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
294PACKAGE_NAME = @PACKAGE_NAME@ 294PACKAGE_NAME = @PACKAGE_NAME@
295PACKAGE_STRING = @PACKAGE_STRING@ 295PACKAGE_STRING = @PACKAGE_STRING@
296PACKAGE_TARNAME = @PACKAGE_TARNAME@ 296PACKAGE_TARNAME = @PACKAGE_TARNAME@
297PACKAGE_URL = @PACKAGE_URL@
297PACKAGE_VERSION = @PACKAGE_VERSION@ 298PACKAGE_VERSION = @PACKAGE_VERSION@
298PATH_SEPARATOR = @PATH_SEPARATOR@ 299PATH_SEPARATOR = @PATH_SEPARATOR@
299PCRE_CFLAGS = @PCRE_CFLAGS@ 300PCRE_CFLAGS = @PCRE_CFLAGS@