diff options
| author | unknown <sasha@asksasha.com> | 2006-01-30 20:58:17 -0700 |
|---|---|---|
| committer | unknown <sasha@asksasha.com> | 2006-01-30 20:58:17 -0700 |
| commit | 99f9a601ca2ccc3b52dc9d036861736bf7ffbd20 (patch) | |
| tree | a43903bfd18ddb15a24702478bd33e71a051f932 /.bzrignore | |
| parent | 3a2b70f8414a1ee02f8a210f22a2707f66bf0ce5 (diff) | |
| parent | 4f9088ae858b2e19d5ac1989d1521bcbc1809f07 (diff) | |
| download | mariadb-git-99f9a601ca2ccc3b52dc9d036861736bf7ffbd20.tar.gz | |
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new
BitKeeper/etc/ignore:
Added BitKeeper/etc/RESYNC_TREE to the ignore list
client/mysqltest.c:
merged
mysql-test/r/mysqltest.result:
merged
mysql-test/t/mysqltest.test:
merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index dd2a5d4530a..16211ff2ecf 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1611,3 +1611,4 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj +BitKeeper/etc/RESYNC_TREE |