diff options
| author | lars@black.(none) <> | 2006-11-13 12:45:31 +0100 |
|---|---|---|
| committer | lars@black.(none) <> | 2006-11-13 12:45:31 +0100 |
| commit | 63c906f74983ea9c8f8728c9e1903fbc55f26e87 (patch) | |
| tree | eb796a1a532ee9d10c8c44e5cd764977260d29a0 /BitKeeper/etc | |
| parent | f5d2077061217b00fe5c8792cad25e7220a1c76e (diff) | |
| parent | 2b2529de79dfe4211d0b3d23cc9d8bb49d031687 (diff) | |
| download | mariadb-git-63c906f74983ea9c8f8728c9e1903fbc55f26e87.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/collapsed | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 226f0f1a2e2..10bc7a2182a 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,5 +15,7 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +452c6c6dAjuNghfc1ObZ_UQ5SCl85g +4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg 454a7ef8gdvE_ddMlJyghvOAkKPNOQ 454f8960jsVT_kMKJtZ9OCgXoba0xQ |