summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2000-12-08 14:00:48 +0100
committerunknown <serg@serg.mysql.com>2000-12-08 14:00:48 +0100
commit5d3584a3068240752448b01ab6b8666bdde78e17 (patch)
tree14af5fcf4af62eb821a02fdf06df87606cf44e70 /BitKeeper
parent3a62f018f33690b787ed802f7697c17ab4c08288 (diff)
parent63c64ac950710083d188a0878d686e701e7da7ea (diff)
downloadmariadb-git-5d3584a3068240752448b01ab6b8666bdde78e17.tar.gz
Merge
BitKeeper/etc/gone: auto-merge BitKeeper/etc/ignore: merged, cleaned up
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/gone4
1 files changed, 2 insertions, 2 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone
index 18db75b7d5a..0bdf87c0a8d 100644
--- a/BitKeeper/etc/gone
+++ b/BitKeeper/etc/gone
@@ -1,7 +1,7 @@
+mwagner@evoq.home.mwagner.org|mysql-test/r/3.23/README|20001009213643|10190|f9fd36f3c3711305
+mwagner@evoq.home.mwagner.org|mysql-test/share/README|20001009213643|10987|6cd25db633f30de5
mwagner@evoq.home.mwagner.org|mysql-test/var/lib/README|20001009213643|15351|3b652c0f321e1940
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
-mwagner@evoq.home.mwagner.org|mysql-test/share/README|20001009213643|10987|6cd25db633f30de5
-mwagner@evoq.home.mwagner.org|mysql-test/r/3.23/README|20001009213643|10190|f9fd36f3c3711305
sasha@mysql.sashanet.com|mysql-test/t/include/master-slave.inc|20001118030458|01636|556fd038c3a3d54