diff options
author | bar@bar.intranet.mysql.r18.ru <> | 2006-11-03 10:29:44 +0400 |
---|---|---|
committer | bar@bar.intranet.mysql.r18.ru <> | 2006-11-03 10:29:44 +0400 |
commit | 88034969030110debffcbd616296b8b2ee55b71b (patch) | |
tree | ff19959abc0e07bddc35e7501eb6079757331ce7 /BitKeeper | |
parent | 8748cde937faecb74c4ac001e67c1dcb2d5207df (diff) | |
parent | c378d3a1ecead4c7273287e52778aa64eba4ee8d (diff) | |
download | mariadb-git-88034969030110debffcbd616296b8b2ee55b71b.tar.gz |
Merge mysql.com:/usr/home/bar/mysql-5.0-rpl
into mysql.com:/usr/home/bar/mysql-5.1-rpl
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/collapsed | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 224b77be41b..dd7fddf1de3 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -8,3 +8,4 @@ 4519a6c5BVUxEHTf5iJnjZkixMBs8g 451ab499rgdjXyOnUDqHu-wBDoS-OQ 452c6c6dAjuNghfc1ObZ_UQ5SCl85g +4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg |