diff options
| author | cmiller@zippy.(none) <> | 2006-07-03 11:35:58 -0400 |
|---|---|---|
| committer | cmiller@zippy.(none) <> | 2006-07-03 11:35:58 -0400 |
| commit | 6110a83a0e7843829c2927b3b0c3a375cae25077 (patch) | |
| tree | 26ea19d61c67c7cded9c9c925281f64ddf51bc14 /.bzrignore | |
| parent | ea794df45adcd876561c36ed26a5fa935668c58d (diff) | |
| parent | d5ff4f68821c8c86e990149b5c289d7f32f5c09d (diff) | |
| download | mariadb-git-6110a83a0e7843829c2927b3b0c3a375cae25077.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index d570c36c7f5..2fdd5b3e68f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1120,6 +1120,7 @@ server-tools/instance-manager/messages.cpp server-tools/instance-manager/mysql_connection.cpp server-tools/instance-manager/mysqlmanager server-tools/instance-manager/mysqlmanager.cpp +server-tools/instance-manager/net_serv.cc server-tools/instance-manager/options.cpp server-tools/instance-manager/parse.cpp server-tools/instance-manager/parse_output.cpp @@ -1780,4 +1781,3 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj -server-tools/instance-manager/net_serv.cc |