summaryrefslogtreecommitdiff
path: root/.bzr-mysql
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2009-09-18 16:44:11 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2009-09-18 16:44:11 +0200
commit9d9ee646379d68b935d6a4406c4abad363ead061 (patch)
tree9bc9b5f2b9ed75a2724413e7f1a4e3dd3d1760dc /.bzr-mysql
parentc4f915ded38b28d92efb7075f989b8e7fa163a78 (diff)
parent4e32e4f0c6124cf09e95c6c9ff61ab0c53f23240 (diff)
downloadmariadb-git-9d9ee646379d68b935d6a4406c4abad363ead061.tar.gz
new merge from trunk
Diffstat (limited to '.bzr-mysql')
-rw-r--r--.bzr-mysql/default.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index 834e08a9dfe..a81954c9bcd 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-5.4-mtr"
+tree_name = "mysql-trunk-mtr"