diff options
| author | mtaylor@qualinost.(none) <> | 2007-01-26 13:11:10 -0800 |
|---|---|---|
| committer | mtaylor@qualinost.(none) <> | 2007-01-26 13:11:10 -0800 |
| commit | b7a7d3f7c674196402163038b95a7f601f658510 (patch) | |
| tree | 360868f2faebaa99cf32b37935a54bf7b37ff19b /BitKeeper/etc | |
| parent | 46b3a3d7dd89d937a292bd3f7e3a3d6c6ea7f41d (diff) | |
| parent | f8f11eb2d9ad180eea685c4624d7540df24ec232 (diff) | |
| download | mariadb-git-b7a7d3f7c674196402163038b95a7f601f658510.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
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 96fa1623269..d16baafda14 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -34,3 +34,5 @@ 4562ba016dYH0JzszOqZ8p6psbKfnQ 45771031yRCoM_ZfONdYchPvVEgLRg 45ae6628gqKTsUFfnoNExadETVIkbA +45ba4faf2oqu6eR8fqecR3LfSNcYUg +45ba5238-NKl80QVXzdGo8hO9M75Xg |