summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-11-05 01:32:55 +0200
committermonty@mysql.com <>2005-11-05 01:32:55 +0200
commita6f5375cb0cb40055f52e92d20ca04233ce70386 (patch)
tree4a7b533b6da471261f5c13c46e4e9f256ec63a0c /BitKeeper
parent3b74bb1b03a32616818f50f59cc44644036ab711 (diff)
parent303f6b4a7a44511aeb33ccbd9ff43ea2d454aa4c (diff)
downloadmariadb-git-a6f5375cb0cb40055f52e92d20ca04233ce70386.tar.gz
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/config1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config
index 81e867e514f..b68810b77ac 100644
--- a/BitKeeper/etc/config
+++ b/BitKeeper/etc/config
@@ -73,5 +73,6 @@ hours:
[nick:]checkout:get
[jonas:]checkout:get
[tomas:]checkout:get
+[guilhem:]checkout:get
checkout:edit
eoln:unix