summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2006-11-13 13:19:13 -0500
committercmiller@zippy.cornsilk.net <>2006-11-13 13:19:13 -0500
commitff26bf49c8460fe9fa40393521764f341c518c86 (patch)
tree1cd7d6234dca63d740a1b622d46546471f574ba8 /BitKeeper/etc
parentbf8a9e544c2aef5328a6d9a67d6277b988beb6fd (diff)
parent8471897fbc01520bfdf93a7105019e17cdbca89e (diff)
downloadmariadb-git-ff26bf49c8460fe9fa40393521764f341c518c86.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'BitKeeper/etc')
-rw-r--r--BitKeeper/etc/collapsed8
1 files changed, 8 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index ddaafba882c..2509fa50a7b 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -16,6 +16,14 @@
45214a07hVsIGwvwa-WrO-jpeaSwVw
452a92d0-31-8wSzSfZi165fcGcXPA
454a7ef8gdvE_ddMlJyghvOAkKPNOQ
+454bb488ijVLOUK_GFjcoISE0GxPUA
+454bb9a8AwlGRC_wWLS2sNMoRBMRGw
+454c946ciQoR4dfTBZ0RTBmGJKp6lw
+454f6e7eAnfLD9OCbGr5X9KiKvfKcQ
+454f704bJiJy0_Nx2drY9P5kK3uOzg
454f8960jsVT_kMKJtZ9OCgXoba0xQ
+454fa71cxshxszXJQYa9jbo0-_hAHw
+4550b0ceIcozdgQhWFUTAtWkN196lA
4554a95d7txO1DuO9G3nAizI3SkFAA
4554b3722d71SbPiI2Gx-RhbZjmuIQ
+4558b3d73Cxjlb7Wv1oytdSTthxDfw