diff options
author | cmiller@zippy.cornsilk.net <> | 2007-01-03 18:24:28 -0500 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2007-01-03 18:24:28 -0500 |
commit | 68428545a59cd0b582a9dc648463e1a04b3c9a6a (patch) | |
tree | 4377783fbb5881088a2e6f6feef7948db014eb3a /BitKeeper | |
parent | 499eb4d8bae79220ff461fccc05e25e15629ec88 (diff) | |
parent | 10cdf90bd37fe5eb2cb22398520f3c6e8cb693ae (diff) | |
download | mariadb-git-68428545a59cd0b582a9dc648463e1a04b3c9a6a.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/collapsed | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 5ff033b2163..e754ac133ea 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -29,3 +29,6 @@ 4554a95d7txO1DuO9G3nAizI3SkFAA 4554b3722d71SbPiI2Gx-RhbZjmuIQ 4558b3d73Cxjlb7Wv1oytdSTthxDfw +459c03b9N_mqF2XJKK6DwSrIt7e6_g +459c1965_BQMBzBO8S_gVqjTHYQrmw +459c2098XoAUsUn8N07IVRDD6CTM-A |