diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-11-06 17:46:50 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-11-06 17:46:50 -0500 |
| commit | a759280347da39cd5caa8f9c8b67a8615117d5d8 (patch) | |
| tree | 252603af37845ce5c9c725c5e6c1ef5dc7a05083 /BitKeeper | |
| parent | a56565b8d551222bb610a7c3df2b4d3ebbf4459b (diff) | |
| parent | 40170fbf58c84f9a5186adcb418ffa7b83104ae3 (diff) | |
| download | mariadb-git-a759280347da39cd5caa8f9c8b67a8615117d5d8.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my51-bug23411
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 311c3813abf..226f0f1a2e2 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,3 +15,5 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +454a7ef8gdvE_ddMlJyghvOAkKPNOQ +454f8960jsVT_kMKJtZ9OCgXoba0xQ |