summaryrefslogtreecommitdiff
path: root/BitKeeper/etc/collapsed
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2006-10-09 18:51:02 -0400
committercmiller@zippy.cornsilk.net <>2006-10-09 18:51:02 -0400
commit681acdf055ff18af97b40d27842770309d34fbb8 (patch)
tree938d2cdf97f5924099e78141128f7a823185a096 /BitKeeper/etc/collapsed
parent237779218c0d2085b28b5f957bd10613d37b7290 (diff)
parent438ffa81fb50fdaf38fa82158060862a29c5f074 (diff)
downloadmariadb-git-681acdf055ff18af97b40d27842770309d34fbb8.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
Diffstat (limited to 'BitKeeper/etc/collapsed')
-rw-r--r--BitKeeper/etc/collapsed1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 79836bb030e..5aee68d5e9d 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -7,3 +7,4 @@
4513d8e4Af4dQWuk13sArwofRgFDQw
4519a6c5BVUxEHTf5iJnjZkixMBs8g
451ab499rgdjXyOnUDqHu-wBDoS-OQ
+452a92d0-31-8wSzSfZi165fcGcXPA