summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-01-24 20:51:52 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-01-24 20:51:52 +0000
commit558e3b862222fb94a8edcd7b25f50e6b0ba153bb (patch)
tree5707485bb5d1f72388bc95306644f1ba782e3f8e /BitKeeper/etc
parentd742e651089ae82f814c1b4bc1d429f78a5e295f (diff)
the opie+qtopia.patch for Frodo was accepted and integrated by the upstream author
BKrev: 4012dae8uIlI86jSPF-eVLf3SkuuDA
Diffstat (limited to 'BitKeeper/etc')
-rw-r--r--BitKeeper/etc/logging_ok1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 035573feac..f9483e2eaa 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -10,6 +10,7 @@ kergoth@nexus.(none)
kergoth@zelda.tuxnami.org
mallum@shuttle.(none)
mickey@allanon.vanille.de
+mickey@merlin.vanille.de
mickeyl@gandalf.tm.informatik.uni-frankfurt.de
p.osiczko@tetrapyloctomy.org
pablo@kosmos.(none)