diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-01-26 14:47:35 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-01-26 14:47:35 -0500 |
| commit | f74992258a4fcbd14f2f6a7754302e61f02a69a7 (patch) | |
| tree | 5fcb06fdfa66050c761b4c31340d1e0016fbcd66 /BitKeeper/etc/collapsed | |
| parent | 603475cbf9e6cd69db479e27ff172ff4ec99442e (diff) | |
| parent | 41179e6a8f3ea4e2d76de1e075eef00b966c65aa (diff) | |
| download | mariadb-git-f74992258a4fcbd14f2f6a7754302e61f02a69a7.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'BitKeeper/etc/collapsed')
| -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 eb205a2ac2f..2c730ee5808 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -31,3 +31,5 @@ 4558b3d73Cxjlb7Wv1oytdSTthxDfw 45771031yRCoM_ZfONdYchPvVEgLRg 45ae6628gqKTsUFfnoNExadETVIkbA +45ba4faf2oqu6eR8fqecR3LfSNcYUg +45ba5238-NKl80QVXzdGo8hO9M75Xg |