summaryrefslogtreecommitdiffhomepage
path: root/AUTHORS
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-05-23 02:20:13 +0900
committerYukihiro Matsumoto <[email protected]>2012-05-23 02:20:13 +0900
commitdf25301d8081b9351d8a2a9910c2f1d36de3f134 (patch)
tree4f9cb83bab56b02a41a6139c8d23d7b071529845 /AUTHORS
parentf44acf7bf87c8f4ad258a41bb7884c1f09a8aab9 (diff)
parent0dc183b8f473e1398b1aeada9a39d96ad4d81518 (diff)
downloadmruby-df25301d8081b9351d8a2a9910c2f1d36de3f134.tar.gz
mruby-df25301d8081b9351d8a2a9910c2f1d36de3f134.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index b39a69220..b4554be64 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,3 +4,4 @@ Original Authors "mruby developers" are:
Kyushu Institute of Technology
Network Applied Communication Laboratory, Inc.
Daniel Bovensiepen
+ Jon Maken