summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-01-31 16:09:36 -0500
committercmiller@zippy.cornsilk.net <>2007-01-31 16:09:36 -0500
commita3a9d8bd846682f31a9667a37adfd9ff93b13535 (patch)
tree16ceb76154be4fea1e33bfc815b092f6c32118ef /BitKeeper
parent0fa22f5a59a8aec24dd4a2f077e5499ffafc2f51 (diff)
parent24e3508b0e3d1ca10a5a8e9db102a506371ebb1c (diff)
downloadmariadb-git-a3a9d8bd846682f31a9667a37adfd9ff93b13535.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed6
1 files changed, 6 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index f1dabcfe2ee..8c16a79fad7 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -33,3 +33,9 @@
4561bde4qWhz1I8tkItXKex5uniipA
4562ba016dYH0JzszOqZ8p6psbKfnQ
45771031yRCoM_ZfONdYchPvVEgLRg
+459a60d8rIxeTuhB3j_QsOwLGdcpng
+459a61c9OS8PzIsdviZJDkybJ1y1uA
+459a70691aYIfU2ohV0a3P5iTLpO2A
+459a7422KF_P7PuU3YQ5qG6ZLEVpiA
+459a74e4nRcXppMSBYeQQ5efDkTADg
+45c0fdfb2mz6NdOIsLenJtf6_ZelTA