diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-11-11 08:57:26 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-11-11 08:57:26 -0500 |
| commit | 7aa1e7190d133dd9bbd9ed7e8ef2923497de1167 (patch) | |
| tree | 659cbf6be1c0a88047c9f0d75f138054eb435190 /BitKeeper | |
| parent | 6260e12b99f9d3276a69c115ea3b922bea87a50e (diff) | |
| parent | 72dfd02634ad7eb076548a739784d83972f7a661 (diff) | |
| download | mariadb-git-7aa1e7190d133dd9bbd9ed7e8ef2923497de1167.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-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 |