diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:02:15 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:02:15 +0300 |
commit | e6675a249042e67a68adca988fce82766280d114 (patch) | |
tree | af7b36f70bd1ae4b2fae57b0c7ccf36e41ec7362 /.bzr-mysql | |
parent | d097b407732b243d0c53127f7e289ce1c04597eb (diff) | |
parent | 2e906736eb42a836ef9d0b28d40bba983a11b78c (diff) | |
download | mariadb-git-e6675a249042e67a68adca988fce82766280d114.tar.gz |
Auto-merge from mysql-5.1.
Diffstat (limited to '.bzr-mysql')
-rw-r--r-- | .bzr-mysql/default.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index 4eab3d239d0..fcb3cab2de6 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-trunk-bugfixing" +tree_name = "mysql-trunk" |