diff options
author | cmiller@zippy.cornsilk.net <> | 2007-01-17 13:24:20 -0500 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2007-01-17 13:24:20 -0500 |
commit | 8a746fc0d27eabd98a6f7d7df7dcaa33c563ee86 (patch) | |
tree | e487fce7ea1d116ffde1a46a78c18a65699f9291 /BitKeeper | |
parent | f10a24314d61c011b8a7c99f1db0c6f4d2e763e0 (diff) | |
parent | 332f9ff8b480fcec7259934b1a7b78f126bcaee1 (diff) | |
download | mariadb-git-8a746fc0d27eabd98a6f7d7df7dcaa33c563ee86.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
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 951d894c5b6..eb205a2ac2f 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -30,3 +30,4 @@ 4554b3722d71SbPiI2Gx-RhbZjmuIQ 4558b3d73Cxjlb7Wv1oytdSTthxDfw 45771031yRCoM_ZfONdYchPvVEgLRg +45ae6628gqKTsUFfnoNExadETVIkbA |