diff options
| author | lars/lthalmann@mysql.com/dl145h.mysql.com <> | 2006-11-07 12:02:53 +0100 |
|---|---|---|
| committer | lars/lthalmann@mysql.com/dl145h.mysql.com <> | 2006-11-07 12:02:53 +0100 |
| commit | aea1e14ef81b68332151faaa99ccb40a97e96b25 (patch) | |
| tree | 214efbfcc03cc6ef5dd9efc1421eda2a2bdd3e4f /BitKeeper/etc | |
| parent | 56f10ac81a9eefe03a1c0e0bbb25d928c64db6b3 (diff) | |
| parent | c378d3a1ecead4c7273287e52778aa64eba4ee8d (diff) | |
| download | mariadb-git-aea1e14ef81b68332151faaa99ccb40a97e96b25.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-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 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 |