diff options
author | cmiller@zippy.cornsilk.net <> | 2007-01-17 13:25:05 -0500 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2007-01-17 13:25:05 -0500 |
commit | 00fc0fa9eee76c6baee7833813bdd3bb556b7fc3 (patch) | |
tree | 40f8526f6e1a8a52303bf33a2874311ba557fec3 /BitKeeper | |
parent | eee98226e729c1a258f6b77078b2b7bdf39c21a9 (diff) | |
parent | 8a746fc0d27eabd98a6f7d7df7dcaa33c563ee86 (diff) | |
download | mariadb-git-00fc0fa9eee76c6baee7833813bdd3bb556b7fc3.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my51-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 f1dabcfe2ee..96fa1623269 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -33,3 +33,4 @@ 4561bde4qWhz1I8tkItXKex5uniipA 4562ba016dYH0JzszOqZ8p6psbKfnQ 45771031yRCoM_ZfONdYchPvVEgLRg +45ae6628gqKTsUFfnoNExadETVIkbA |