diff options
| author | dlenev@mockturtle.local <> | 2006-09-29 10:55:03 +0400 |
|---|---|---|
| committer | dlenev@mockturtle.local <> | 2006-09-29 10:55:03 +0400 |
| commit | a4ee7ec15368707f87de30e9bb261491a2a95ff0 (patch) | |
| tree | d8ead16d04f76d57f33c217ab7782d7f850e10f7 /BitKeeper/etc | |
| parent | 3b672c9a3c5c3f2b4fb5dd82300f2e022ca6decb (diff) | |
| parent | 4aaf7e34ff45f084234b007b68fb4e0f892ca625 (diff) | |
| download | mariadb-git-a4ee7ec15368707f87de30e9bb261491a2a95ff0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/collapsed | 1 | ||||
| -rw-r--r-- | BitKeeper/etc/config | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 82b3b29742e..bbf04965038 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -4,3 +4,4 @@ 44f33f3aj5KW5qweQeekY1LU0E9ZCg 45001f7c3b2hhCXDKfUvzkX9TNe6VA 45002051rHJfMEXAIMiAZV0clxvKSA +4513d8e4Af4dQWuk13sArwofRgFDQw diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config index 6d06edd193e..1a027813ff4 100644 --- a/BitKeeper/etc/config +++ b/BitKeeper/etc/config @@ -75,5 +75,6 @@ hours: [tomas:]checkout:get [guilhem:]checkout:get [pekka:]checkout:get +[msvensson:]checkout:get checkout:edit eoln:unix |