summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlipp <mysteriousragnarok@hotmail.com>2014-01-14 11:27:14 -0800
committerFlipp <mysteriousragnarok@hotmail.com>2014-01-14 11:27:14 -0800
commit499e228a01d84ec2ab0a4edaf8aeb868ad4e7618 (patch)
tree2631acd2fd7f2986330f6156d214ed65c1b8f155
parent6caf7cafff77d77a017cc2f0797d1dd3f805aea6 (diff)
parentf846f1e4c4bb15d60cbfdcca5f371dfb196ff6a1 (diff)
downloadhercules-499e228a01d84ec2ab0a4edaf8aeb868ad4e7618.tar.gz
hercules-499e228a01d84ec2ab0a4edaf8aeb868ad4e7618.tar.bz2
hercules-499e228a01d84ec2ab0a4edaf8aeb868ad4e7618.tar.xz
hercules-499e228a01d84ec2ab0a4edaf8aeb868ad4e7618.zip
Merge pull request #250 from cookiecrumb/patch-1
Because someone forgot I've contributed to *athena
-rw-r--r--AUTHORS3
1 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 24405d990..b85402c7e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,6 +48,7 @@ CIA-2
CLOWNISIUS
code
codemaster
+Cookie
css25
Curax
Cydh
@@ -270,4 +271,4 @@ ZoDIaC
胡蝶蘭
過去の人i1
-釈尊 \ No newline at end of file
+釈尊