diff options
| author | kostja@bodhi.local <> | 2006-08-30 03:00:19 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-08-30 03:00:19 +0400 |
| commit | ebb70704303ef3f7e227e8102d8eb4b466bdd9e4 (patch) | |
| tree | 844b46ab5d82eec374f925e63be3812e697f87e3 /BitKeeper/etc | |
| parent | 0368914b9a22891e9eac2b8a77dfbe43ea80c820 (diff) | |
| parent | 3bf609b7f2b73555b1e241dc7c354818b0bbbc5a (diff) | |
| download | mariadb-git-ebb70704303ef3f7e227e8102d8eb4b466bdd9e4.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/collapsed | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 8b90deae622..d4d681937a2 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -1 +1,4 @@ 44d03f27qNdqJmARzBoP3Is_cN5e0w +44ec850ac2k4y2Omgr92GiWPBAVKGQ +44edb86b1iE5knJ97MbliK_3lCiAXA +44f33f3aj5KW5qweQeekY1LU0E9ZCg |