summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-12-04 19:11:55 +0100
committermsvensson@neptunus.(none) <>2006-12-04 19:11:55 +0100
commit971c783f7dd3a136693722f20a815b7171bbbcd8 (patch)
treeac382a3e694ccbe7ed5a481331e35e4f055fdcae /BitKeeper
parent6072b7a4c4b786604b4584058c6c62a339b6d3ba (diff)
parentb70d2b9341ae804fbd5147500a4d29bd86e2a5d6 (diff)
downloadmariadb-git-971c783f7dd3a136693722f20a815b7171bbbcd8.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed10
1 files changed, 10 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index f934fa44580..a10f87c8529 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -16,7 +16,17 @@
45214a07hVsIGwvwa-WrO-jpeaSwVw
452a92d0-31-8wSzSfZi165fcGcXPA
454a7ef8gdvE_ddMlJyghvOAkKPNOQ
+454bb488ijVLOUK_GFjcoISE0GxPUA
+454bb9a8AwlGRC_wWLS2sNMoRBMRGw
+454c946ciQoR4dfTBZ0RTBmGJKp6lw
+454f6e7eAnfLD9OCbGr5X9KiKvfKcQ
+454f704bJiJy0_Nx2drY9P5kK3uOzg
454f8960jsVT_kMKJtZ9OCgXoba0xQ
+454fa71cxshxszXJQYa9jbo0-_hAHw
+4550b0ceIcozdgQhWFUTAtWkN196lA
+4554a95d7txO1DuO9G3nAizI3SkFAA
+4554b3722d71SbPiI2Gx-RhbZjmuIQ
+4558b3d73Cxjlb7Wv1oytdSTthxDfw
4561b2ecZbhuAc0TTDdCdultxUYaMw
4561bde4qWhz1I8tkItXKex5uniipA
4562ba016dYH0JzszOqZ8p6psbKfnQ