diff options
author | bar@mysql.com/bar.intranet.mysql.r18.ru <> | 2006-10-30 10:16:18 +0400 |
---|---|---|
committer | bar@mysql.com/bar.intranet.mysql.r18.ru <> | 2006-10-30 10:16:18 +0400 |
commit | 28eaf5ff755c510941b1598b9b5d947c3ea1fe26 (patch) | |
tree | 0cf4b1878152d8174923217f3ebe7c59ccab64c8 /BitKeeper | |
parent | dc8a559bf129d5a4156648b19b85a32a1b5eb74e (diff) | |
parent | 0e3a1eece7289c56bb653f25523d4518ba694452 (diff) | |
download | mariadb-git-28eaf5ff755c510941b1598b9b5d947c3ea1fe26.tar.gz |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/usr/home/bar/mysql-5.0.b18908
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/collapsed | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 79836bb030e..224b77be41b 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -7,3 +7,4 @@ 4513d8e4Af4dQWuk13sArwofRgFDQw 4519a6c5BVUxEHTf5iJnjZkixMBs8g 451ab499rgdjXyOnUDqHu-wBDoS-OQ +452c6c6dAjuNghfc1ObZ_UQ5SCl85g |