summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@alik.>2006-08-25 13:37:07 +0400
committerunknown <anozdrin/alik@alik.>2006-08-25 13:37:07 +0400
commit59c2322a23f5a4e5f4af024dc4f719532ceafe70 (patch)
treecad3def0040117f77930e076fe5ba2001f1fb10d /BitKeeper
parent06bb99bc9ee2728e19215a516c665874887a07a3 (diff)
parentf69cbbfcb627dde4abdc635f515e1db41dca36fd (diff)
downloadmariadb-git-59c2322a23f5a4e5f4af024dc4f719532ceafe70.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into alik.:/mnt/raid/alik/MySQL/devel/5.0-rt-bug16899
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index c008b9f18fc..1e3fa8f9b34 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -1,2 +1,3 @@
44d03f27qNdqJmARzBoP3Is_cN5e0w
44ec850ac2k4y2Omgr92GiWPBAVKGQ
+44edb86b1iE5knJ97MbliK_3lCiAXA