summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_functions
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-02-02 17:53:02 +0100
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-02-02 17:53:02 +0100
commita3c944c9af662b04bd535342b3957cd3b8ef3ea6 (patch)
tree98b8f623dff0b41eadc937d6c4b45693633318a9 /scilab/modules/compatibility_functions
parente48570f7268d793c40638414c7033b808b18b007 (diff)
parentff995c8d03618d95d4040acd16e4f9622fb11fa8 (diff)
downloadscilab-a3c944c9af662b04bd535342b3957cd3b8ef3ea6.zip
scilab-a3c944c9af662b04bd535342b3957cd3b8ef3ea6.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 6598a64..c4c4f86 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -237,7 +237,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
237PACKAGE_NAME = @PACKAGE_NAME@ 237PACKAGE_NAME = @PACKAGE_NAME@
238PACKAGE_STRING = @PACKAGE_STRING@ 238PACKAGE_STRING = @PACKAGE_STRING@
239PACKAGE_TARNAME = @PACKAGE_TARNAME@ 239PACKAGE_TARNAME = @PACKAGE_TARNAME@
240PACKAGE_URL = @PACKAGE_URL@
241PACKAGE_VERSION = @PACKAGE_VERSION@ 240PACKAGE_VERSION = @PACKAGE_VERSION@
242PATH_SEPARATOR = @PATH_SEPARATOR@ 241PATH_SEPARATOR = @PATH_SEPARATOR@
243PCRE_CFLAGS = @PCRE_CFLAGS@ 242PCRE_CFLAGS = @PCRE_CFLAGS@