summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-01-15 16:48:04 -0200
committershennetsind <ind@henn.et>2014-01-15 16:48:04 -0200
commitfee148f5463dafc8681567e330411e24b94f37b6 (patch)
tree78b6293ba2e4d32d4fc278a367ca32af373bc929 /AUTHORS
parenta3ccc2de2d7d51202c4e4fc43ccd600d67cc0685 (diff)
parent31f29768a286ba0fc47a3d7a9470d6fdf37c7546 (diff)
downloadhercules-fee148f5463dafc8681567e330411e24b94f37b6.tar.gz
hercules-fee148f5463dafc8681567e330411e24b94f37b6.tar.bz2
hercules-fee148f5463dafc8681567e330411e24b94f37b6.tar.xz
hercules-fee148f5463dafc8681567e330411e24b94f37b6.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'AUTHORS')
-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
+釈尊