diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-05-21 20:51:31 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-05-21 20:51:31 +0200 |
| commit | 9e6117c5017c9afe5cc84d4ac8879bb2aceafebb (patch) | |
| tree | 457981143ba9aa6fbb102f4c16f9c4342a747567 /win | |
| parent | 3043367e730aecd311813ab70ef58ebacf23dfe2 (diff) | |
| parent | 2343b95f8b950a61315b6c52bd3c71295218e48b (diff) | |
| download | mariadb-git-9e6117c5017c9afe5cc84d4ac8879bb2aceafebb.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
configure.in:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/Makefile.am b/win/Makefile.am index 1bf7cce8396..279183480d8 100644 --- a/win/Makefile.am +++ b/win/Makefile.am @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Process this file with automake to create Makefile.in -EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README \ +EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README \ mysql_manifest.cmake create_manifest.js # Don't update the files from bitkeeper |