summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-10-03 14:26:11 +0200
committermsvensson@neptunus.(none) <>2006-10-03 14:26:11 +0200
commit4f46f3bde77b1a5ad9a662148e6435537e9f7fff (patch)
tree8d0a6a285975e84bfe85563f390b4f04b857b861 /BitKeeper
parent8eb4401c5948f6e25e6d9894244d0d8eeea7e652 (diff)
parent3f8edc3706e56684bc77896219e062874fecad29 (diff)
downloadmariadb-git-4f46f3bde77b1a5ad9a662148e6435537e9f7fff.tar.gz
Merge bk-internal:/home/bk/mysql-5.0-runtime
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed2
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index bbf04965038..79836bb030e 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -5,3 +5,5 @@
45001f7c3b2hhCXDKfUvzkX9TNe6VA
45002051rHJfMEXAIMiAZV0clxvKSA
4513d8e4Af4dQWuk13sArwofRgFDQw
+4519a6c5BVUxEHTf5iJnjZkixMBs8g
+451ab499rgdjXyOnUDqHu-wBDoS-OQ