diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-11-11 08:58:24 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-11-11 08:58:24 -0500 |
| commit | e0b1e1adcc3fc51fbe2fec949d99c672d730d3fc (patch) | |
| tree | 892a49ac008e056d05b19003535d2755d5bd7ef2 /BitKeeper | |
| parent | d9845ccfd226b39c9e59322ec6802083e85ab6f8 (diff) | |
| parent | 7aa1e7190d133dd9bbd9ed7e8ef2923497de1167 (diff) | |
| download | mariadb-git-e0b1e1adcc3fc51fbe2fec949d99c672d730d3fc.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860
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 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 |