diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:18:08 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:18:08 +0000 |
| commit | 3877499a4db1686c0c985da2723bd0643836edf1 (patch) | |
| tree | 931cf8889352c4a93c08086103a4a00f5c74b194 /hsqldb | |
| parent | 124bfb8820d2837e16ac7441079bd192e31f336f (diff) | |
INTEGRATION: CWS dba24c (1.17.8); FILE MERGED
2007/11/05 19:46:36 fs 1.17.8.2: #i80646# removed last patch (timestamp_and_vendor.patch)
2007/11/02 20:42:30 fs 1.17.8.1: #i83079# most patches are obsolete with the move to 1.8.0.9
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index a81cbf075a62..fa160cb53834 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: hr $ $Date: 2007-07-31 14:05:29 $ +# last change: $Author: ihi $ $Date: 2007-11-21 16:18:08 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -56,13 +56,9 @@ TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) TARFILE_ROOTDIR=hsqldb -CONVERTFILES=build$/build.xml\ - doc/changelist_1_8_0.txt\ - src/org/hsqldb/resources/sql-error-messages.properties\ - src/org/hsqldb/Select.java\ - src/org/hsqldb/Expression.java +#CONVERTFILES=build$/build.xml -PATCH_FILE_NAME=hsqldb_1_8_0 +#PATCH_FILE_NAME=hsqldb_1_8_0 # ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \ # src$/org$/hsqldb$/TxManager.java \ |