diff options
| author | Clément DAVID <clement.david@scilab.org> | 2010-02-03 12:18:23 +0100 |
|---|---|---|
| committer | Clément DAVID <clement.david@scilab.org> | 2010-02-03 12:18:23 +0100 |
| commit | 335462d0ce79a7e8d961955fdee026c4d0d040b2 (patch) | |
| tree | 40faa41d726279fbf74a29a1b3465a8079b0468d /scilab/modules/data_structures | |
| parent | 3efa7732c0c216c19430280b488efbf8ea668856 (diff) | |
| parent | 667525c7fdb7cadc0b7e5e8b03762cba1257a3fa (diff) | |
| download | scilab-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/data_structures')
| -rw-r--r-- | scilab/modules/data_structures/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in index 16f7bff..b1eb8e1 100644 --- a/scilab/modules/data_structures/Makefile.in +++ b/scilab/modules/data_structures/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, |
| @@ -308,6 +308,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | |||
| 308 | PACKAGE_NAME = @PACKAGE_NAME@ | 308 | PACKAGE_NAME = @PACKAGE_NAME@ |
| 309 | PACKAGE_STRING = @PACKAGE_STRING@ | 309 | PACKAGE_STRING = @PACKAGE_STRING@ |
| 310 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | 310 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
| 311 | PACKAGE_URL = @PACKAGE_URL@ | ||
| 311 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 312 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
| 312 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 313 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
| 313 | PCRE_CFLAGS = @PCRE_CFLAGS@ | 314 | PCRE_CFLAGS = @PCRE_CFLAGS@ |