summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-12-14 09:38:09 -0700
committerIra Rice <irarice@gmail.com>2008-12-14 09:38:09 -0700
commit1f2869dd6fad7e53165a20c085ccdb18af360a7f (patch)
tree50289d8a410f815f7020879a955e0b91187997b2 /AUTHORS
parentfbbb9658d4d90a1080d28f3a720d2777939e8cb6 (diff)
parent4d1ec02eb1179769c218b956bb88681efaa2cff6 (diff)
downloadmana-1f2869dd6fad7e53165a20c085ccdb18af360a7f.tar.gz
mana-1f2869dd6fad7e53165a20c085ccdb18af360a7f.tar.bz2
mana-1f2869dd6fad7e53165a20c085ccdb18af360a7f.tar.xz
mana-1f2869dd6fad7e53165a20c085ccdb18af360a7f.zip
Merge branch 'master' of git@gitorious.org:tmw/aethyra
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 1 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 34618b84..4f30129b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,7 +12,7 @@ Aethyra Dev Team
== Artists ==
- Frictor
+ Frictor <frictor2(at)hotmail.com>
Angeliex
== Map Designers ==