diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-07-05 10:31:15 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-07-05 10:31:15 +0900 |
| commit | 573c9913a1ac2760f5f5e5e91c0841465ff5b2ac (patch) | |
| tree | 41522da86dacbf4252e56e2ace72503c64860e4d /AUTHORS | |
| parent | 8c838b0700ad99cd329832abca5789f3f43e8b3f (diff) | |
| parent | 3b225972747be555f2bc2d42cdddbc1bcf3e4b7b (diff) | |
| download | mruby-573c9913a1ac2760f5f5e5e91c0841465ff5b2ac.tar.gz mruby-573c9913a1ac2760f5f5e5e91c0841465ff5b2ac.zip | |
resolve AUTHORS conflict
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -13,3 +13,4 @@ Original Authors "mruby developers" are: Tadashi FUKUZAWA MATSUMOTO Ryosuke Yasuhiro Matsumoto + Koji Yoshioka |