summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-10-03 13:27:48 +0200
committermsvensson@neptunus.(none) <>2006-10-03 13:27:48 +0200
commit48d99634f3462489abd942125e153d923d83d3b5 (patch)
treec31a909ae7d736ddaa22f8bf5a8dfa0a2a51731c /BitKeeper
parent3910542096992af6cfcfcb12da2545f1c343473c (diff)
parentca21b579922aeb14f8fff3ce36a144d5fb70467b (diff)
downloadmariadb-git-48d99634f3462489abd942125e153d923d83d3b5.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-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