diff options
| author | lars/lthalmann@dl145h.mysql.com <> | 2006-11-07 19:26:31 +0100 |
|---|---|---|
| committer | lars/lthalmann@dl145h.mysql.com <> | 2006-11-07 19:26:31 +0100 |
| commit | 3776e9622baf373de641fbdd512dc610af50b621 (patch) | |
| tree | cb0d57b5036a121d4e718097614fdee010c3c24b /BitKeeper | |
| parent | a56565b8d551222bb610a7c3df2b4d3ebbf4459b (diff) | |
| parent | efaa0f4092e275e8ff4cab68a58247e27aadf64d (diff) | |
| download | mariadb-git-3776e9622baf373de641fbdd512dc610af50b621.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-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 311c3813abf..1a7ce408cf3 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,3 +15,5 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +452c6c6dAjuNghfc1ObZ_UQ5SCl85g +4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg |