diff options
author | cmiller@zippy.cornsilk.net <> | 2006-10-09 18:46:28 -0400 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2006-10-09 18:46:28 -0400 |
commit | 4d0023edf65fff6a05e53bf290a58f5ab5a1ef26 (patch) | |
tree | 7fbf052b3cfeaf4c5d77539748b183f7ee90003d /BitKeeper | |
parent | 40bcedf4e3dc03b63064ab278218764cc4829bdf (diff) | |
parent | 4812d81eabe2c2eeb2818e78e35365a84a44763e (diff) | |
download | mariadb-git-4d0023edf65fff6a05e53bf290a58f5ab5a1ef26.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
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 fd33e4fc902..6eb31cf4571 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -3,3 +3,4 @@ 44edb86b1iE5knJ97MbliK_3lCiAXA 44f33f3aj5KW5qweQeekY1LU0E9ZCg 4513d8e4Af4dQWuk13sArwofRgFDQw +452a92d0-31-8wSzSfZi165fcGcXPA |