diff options
author | Alexander Nozdrin <alik@ibmvm> | 2010-06-10 14:38:32 +0400 |
---|---|---|
committer | Alexander Nozdrin <alik@ibmvm> | 2010-06-10 14:38:32 +0400 |
commit | ad92ee12040cd5317923e00cdf2ecd1b66a7b9ed (patch) | |
tree | f687613e190daf79b2ec3bac0b3a325cf4e711cc /.bzr-mysql | |
parent | d348f1219feba75e0200d2797944edd945b586f7 (diff) | |
parent | ddf6a66504ba04de944a8560ed350387a4026a7a (diff) | |
download | mariadb-git-ad92ee12040cd5317923e00cdf2ecd1b66a7b9ed.tar.gz |
Auto-merge from mysql-trunk-bugfixing.
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" |