diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-18 19:34:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 19:34:50 +0200 |
| commit | 9508b781eff5a2a6857f1467b0a39dbde06e4446 (patch) | |
| tree | 10f4791421cf9af3d8fd39785f67ba6d474da5f6 /scripts/Makefile.am | |
| parent | 214d2d1c9f259a3e659228e9cc364784e217d4d3 (diff) | |
| parent | b4573eb4caff7e2a112c79f7923d565fb836e8a0 (diff) | |
| download | mariadb-git-9508b781eff5a2a6857f1467b0a39dbde06e4446.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
scripts/Makefile.am:
Auto merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 6338e9e1b67..ff3bfceb78d 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -57,7 +57,8 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ mysqlaccess.conf \ mysqlbug \ make_win_bin_dist \ - mysql_system_tables_fix.sql + mysql_system_tables_fix.sql \ + CMakeLists.txt dist_pkgdata_DATA = fill_help_tables.sql \ mysql_fix_privilege_tables.sql \ |