summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2011-01-27 19:49:23 +0100
committerStefan Beller <stefanbeller@googlemail.com>2011-01-27 19:49:23 +0100
commit59b8add30ccc1efdddf9dee5888f3d6334800a32 (patch)
treee3b03d20d534002def1e8bcabde300902ad27ed4
parent2d94d51d4e001d6017db1e3891bbe3a1dae2dfd5 (diff)
downloadserverdata-59b8add30ccc1efdddf9dee5888f3d6334800a32.tar.gz
serverdata-59b8add30ccc1efdddf9dee5888f3d6334800a32.tar.bz2
serverdata-59b8add30ccc1efdddf9dee5888f3d6334800a32.tar.xz
serverdata-59b8add30ccc1efdddf9dee5888f3d6334800a32.zip
Revert remove .mailmap file
This reverts commit 8b7cfa5d54513a9c25d11e6b269ce189b94f4af8. This file was deleted accidentally, due to problems of merging the eathena into eathena-data. All the fixups around the given commit were due to a forced push.
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..4663f9b2
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Dennis Friis <peavey@inspircd.org>
+Thorbjørn Lindeijer <bjorn@lindeijer.nl>