summaryrefslogtreecommitdiffhomepage
path: root/doc/language/README.md
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-04-15 10:55:46 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-04-15 10:55:46 +0900
commit5138f62d6ba666dc0cb43618f407701b0414040e (patch)
tree6847b42135cba62a7ef7f4e359647122d1be173a /doc/language/README.md
parent6e0c48d7584d27883d8fb7e5c6fe8eb6f1db0a91 (diff)
parentf3f99fa2cde9b05fde3fa5e4317ed7dc5e81aea8 (diff)
downloadmruby-5138f62d6ba666dc0cb43618f407701b0414040e.tar.gz
mruby-5138f62d6ba666dc0cb43618f407701b0414040e.zip
resolve conflict
Diffstat (limited to 'doc/language/README.md')
-rw-r--r--doc/language/README.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/language/README.md b/doc/language/README.md
new file mode 100644
index 000000000..67946fe64
--- /dev/null
+++ b/doc/language/README.md
@@ -0,0 +1,9 @@
+# Language
+
+mruby is an implementation of the Ruby programming language.
+These documents are describing the language features and libraries
+which are provided together with mruby.
+
+## Built-In Class and Modules
+
+see *doc/lang/Core.md*