diff options
author | unknown <igor@rurik.mysql.com> | 2005-07-31 02:44:18 -0700 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2005-07-31 02:44:18 -0700 |
commit | 6c40ce76545cc78023a788ab473e870ce10694c5 (patch) | |
tree | eab125f3ab390fa8cb639cbf4604fd61911d465f /VC++Files | |
parent | 629d59a8690328478e2eb2e9950870c7a7d0a726 (diff) | |
parent | 83304cd0b113e0101aa44c350b08161bf7d29eb0 (diff) | |
download | mariadb-git-6c40ce76545cc78023a788ab473e870ce10694c5.tar.gz |
Merge
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
include/config-win.h:
Auto merged
sql/item_sum.cc:
SCCS merged
Diffstat (limited to 'VC++Files')
-rw-r--r-- | VC++Files/client/mysqlclient_ia64.dsp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VC++Files/client/mysqlclient_ia64.dsp b/VC++Files/client/mysqlclient_ia64.dsp index b982b3b281c..bafe729cf6b 100644 --- a/VC++Files/client/mysqlclient_ia64.dsp +++ b/VC++Files/client/mysqlclient_ia64.dsp @@ -155,7 +155,7 @@ SOURCE="..\strings\ctype-czech.c" # End Source File # Begin Source File -SOURCE="..\strings\ctype-cp963.c" +SOURCE="..\strings\ctype-cp932.c" # End Source File # Begin Source File |