summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-04-15 13:10:38 -0600
committerJared Adams <jaxad0127@gmail.com>2009-04-15 13:10:38 -0600
commite8a1b2386bb2c28cfce0eb28d7e7067d51bb6701 (patch)
tree6c9218f32675f9d401301172869c30488ab08b16 /.mailmap
parent56c224050f10d976298cef98607aa3b3e56fcc99 (diff)
parent3d85a00ff2a33e22ba63d0b7dfc156d8076933e1 (diff)
downloadmana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.gz
mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.bz2
mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.xz
mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 7554ca4d..da75efb0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,7 @@
Bjørn Lindeijer <bjorn@lindeijer.nl>
Bjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Bjørn Lindeijer <bjorn@horst-dieter.(none)>
+Ira Rice <irarice@gmail.com>
Majin Sniper <sniper@livecd.janhome.net>
Maximilian Philipps <turmfalke@Turmfalke.(none)>
Victor Fury <frictor@unknown>