diff options
| author | lars@mysql.com/black.(none) <> | 2006-11-13 12:44:53 +0100 |
|---|---|---|
| committer | lars@mysql.com/black.(none) <> | 2006-11-13 12:44:53 +0100 |
| commit | c5d56416bacaf69f5730ad0b970706fb45c15f42 (patch) | |
| tree | 2e35d48c7436cf853a6515a4dccc4e72660d82f3 /BitKeeper | |
| parent | 0f455a81dc2060811498cf1e18059d4f2c7ecd87 (diff) | |
| parent | aa1c8a582643b7f0b6e5e61225ef8516b1131eb3 (diff) | |
| download | mariadb-git-c5d56416bacaf69f5730ad0b970706fb45c15f42.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
Diffstat (limited to 'BitKeeper')
| -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 |