summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2000-12-14 23:30:06 +0100
committerunknown <serg@serg.mysql.com>2000-12-14 23:30:06 +0100
commit67b3f99e428f2e5ca9ebe2e1a99b9d24a70943e3 (patch)
treeb4594ba6e27ec3a53377ca262dc34c626a4e3ed9 /BitKeeper
parentf48d4424b025ed44f4a9726537437a269b26a2f4 (diff)
downloadmariadb-git-67b3f99e428f2e5ca9ebe2e1a99b9d24a70943e3.tar.gz
Merge
BitKeeper/etc/gone: auto-merge
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/gone2
1 files changed, 1 insertions, 1 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone
index 339af0a052d..6b517d15be5 100644
--- a/BitKeeper/etc/gone
+++ b/BitKeeper/etc/gone
@@ -4,5 +4,5 @@ mwagner@evoq.home.mwagner.org|mysql-test/var/lib/README|20001009213643|15351|3b6
mwagner@evoq.home.mwagner.org|mysql-test/var/log/README|20001009213643|16203|df5481fdbe6e5b6e
mwagner@evoq.home.mwagner.org|mysql-test/var/run/README|20001009213643|17062|acb305e4c2ed5990
mwagner@evoq.home.mwagner.org|mysql-test/var/tmp/README|20001009213643|17904|b32d866bfd50e72e
-sasha@mysql.sashanet.com|mysql-test/t/include/master-slave.inc|20001118030458|01636|556fd038c3a3d54
sasha@mysql.sashanet.com|mysql-test/README.gcov|20001012045950|28177|5a6da067a30780ce
+sasha@mysql.sashanet.com|mysql-test/t/include/master-slave.inc|20001118030458|01636|556fd038c3a3d54