diff options
| author | unknown <pem@mysql.com> | 2004-07-23 18:54:01 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2004-07-23 18:54:01 +0200 |
| commit | 6ab9b7b6b91ccba17a7431c7366ac030bbdf6d83 (patch) | |
| tree | 7084123a00378c00f7a67da32f9ffe811f8676e3 /VC++Files | |
| parent | 3783a74dcd1447579dfa4d876a58a5842b03c797 (diff) | |
| parent | 129bc589e18944c7628e8142067605c4f66c4539 (diff) | |
| download | mariadb-git-6ab9b7b6b91ccba17a7431c7366ac030bbdf6d83.tar.gz | |
Post-merge fix.
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/zlib/zlib.dsp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/VC++Files/zlib/zlib.dsp b/VC++Files/zlib/zlib.dsp index 7093c51d558..3a2e25fe2b0 100644 --- a/VC++Files/zlib/zlib.dsp +++ b/VC++Files/zlib/zlib.dsp @@ -122,31 +122,23 @@ SOURCE=.\crc32.c # End Source File # Begin Source File -SOURCE=.\deflate.c -# End Source File -# Begin Source File - -SOURCE=.\deflate.h +SOURCE=.\crc32.h # End Source File # Begin Source File -SOURCE=.\gzio.c -# End Source File -# Begin Source File - -SOURCE=.\infblock.c +SOURCE=.\deflate.c # End Source File # Begin Source File -SOURCE=.\infblock.h +SOURCE=.\deflate.h # End Source File # Begin Source File -SOURCE=.\infcodes.c +SOURCE=.\gzio.c # End Source File # Begin Source File -SOURCE=.\infcodes.h +SOURCE=.\infback.c # End Source File # Begin Source File @@ -166,7 +158,7 @@ SOURCE=.\inflate.c # End Source File # Begin Source File -SOURCE=.\inftrees.c +SOURCE=.\inflate.h # End Source File # Begin Source File @@ -174,11 +166,11 @@ SOURCE=.\inftrees.h # End Source File # Begin Source File -SOURCE=.\infutil.c +SOURCE=.\inftrees.c # End Source File # Begin Source File -SOURCE=.\infutil.h +SOURCE=.\inftrees.h # End Source File # Begin Source File |