summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@booka.>2006-11-22 17:34:09 +0300
committerunknown <anozdrin/alik@booka.>2006-11-22 17:34:09 +0300
commit68adc7b3bf9920d9e471d9a1912db0ca4be33b90 (patch)
treeeb59f82909d249f23d807fcbd40890b15c1def19 /BitKeeper
parentde2fbec489db579451d51a327f4e779d93996b87 (diff)
parent4f096746752091b5da2c58994859852e24e0451b (diff)
downloadmariadb-git-68adc7b3bf9920d9e471d9a1912db0ca4be33b90.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into booka.:/home/alik/MySQL/devel/5.1-rt-im
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed3
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 226f0f1a2e2..f934fa44580 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -17,3 +17,6 @@
452a92d0-31-8wSzSfZi165fcGcXPA
454a7ef8gdvE_ddMlJyghvOAkKPNOQ
454f8960jsVT_kMKJtZ9OCgXoba0xQ
+4561b2ecZbhuAc0TTDdCdultxUYaMw
+4561bde4qWhz1I8tkItXKex5uniipA
+4562ba016dYH0JzszOqZ8p6psbKfnQ