diff options
| author | msvensson@neptunus.(none) <> | 2006-11-13 16:39:44 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-13 16:39:44 +0100 |
| commit | bf8a9e544c2aef5328a6d9a67d6277b988beb6fd (patch) | |
| tree | d0652cf71d2ea41c2ddda9c8c1096f5403041bd7 /BitKeeper/etc | |
| parent | 68a7d45a0a32047aca52ca96765172c03a6f5db1 (diff) | |
| parent | 2cbb366863569e2fd3089fb5d4b724fffc08e25b (diff) | |
| download | mariadb-git-bf8a9e544c2aef5328a6d9a67d6277b988beb6fd.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-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 226f0f1a2e2..ddaafba882c 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -17,3 +17,5 @@ 452a92d0-31-8wSzSfZi165fcGcXPA 454a7ef8gdvE_ddMlJyghvOAkKPNOQ 454f8960jsVT_kMKJtZ9OCgXoba0xQ +4554a95d7txO1DuO9G3nAizI3SkFAA +4554b3722d71SbPiI2Gx-RhbZjmuIQ |