summaryrefslogtreecommitdiff
path: root/VC++Files/merge
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-06-28 17:26:11 +0300
committermonty@hundin.mysql.fi <>2002-06-28 17:26:11 +0300
commit578a9d9901fe19723a028854b6d2774a778c0740 (patch)
tree27f0f967ee5f642c6cb7ecfab977612a3d7e57d3 /VC++Files/merge
parent20005fad016bf602c747f5cd42ab0f5fd4fa75b3 (diff)
downloadmariadb-git-578a9d9901fe19723a028854b6d2774a778c0740.tar.gz
Updated windows files (VC++ files and winmysqladmin).
Portability fixes. Removed compiler warnings.
Diffstat (limited to 'VC++Files/merge')
-rw-r--r--VC++Files/merge/merge.dsp8
1 files changed, 0 insertions, 8 deletions
diff --git a/VC++Files/merge/merge.dsp b/VC++Files/merge/merge.dsp
index cb6042e6b68..70c0ce87d6b 100644
--- a/VC++Files/merge/merge.dsp
+++ b/VC++Files/merge/merge.dsp
@@ -92,10 +92,6 @@ SOURCE=.\mrg_create.c
# End Source File
# Begin Source File
-SOURCE=.\mrg_def.h
-# End Source File
-# Begin Source File
-
SOURCE=.\mrg_delete.c
# End Source File
# Begin Source File
@@ -134,9 +130,5 @@ SOURCE=.\mrg_static.c
SOURCE=.\mrg_update.c
# End Source File
-# Begin Source File
-
-SOURCE=.\mrgdef.h
-# End Source File
# End Target
# End Project