diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-09-27 20:00:40 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-09-27 20:00:40 +0300 |
| commit | 6f296a01ac39f7d10774fd3d93b5633f31ce99c7 (patch) | |
| tree | b1739519539f0be37309a5bf39efeb9b45e3d7f0 /.bzrignore | |
| parent | f4afcec393e9c75531220c1fe1f5d387891549fa (diff) | |
| download | mariadb-git-6f296a01ac39f7d10774fd3d93b5633f31ce99c7.tar.gz | |
Fixed merge problems.
BitKeeper/etc/ignore:
Added libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 6001873606c..18b01f4714a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3056,3 +3056,7 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +libmysql_r/client_settings.h +libmysqld/scheduler.cc +libmysqld/sql_connect.cc +libmysqld/sql_tablespace.cc |