summaryrefslogtreecommitdiffhomepage
path: root/zh-cn/java-cn.html.markdown
diff options
context:
space:
mode:
authorChenbo Li <lichenbo1949@gmail.com>2013-08-02 23:44:26 +0800
committerChenbo Li <lichenbo1949@gmail.com>2013-08-02 23:44:26 +0800
commit90fa867a66323c9936b9b6f833f1c6b9eb7a16ad (patch)
treed236da21d945b9d6f9370b2d770aad19d59280ca /zh-cn/java-cn.html.markdown
parent1a52aefcba5c31bb05b58290380509d6da81045c (diff)
parent3baf491ea66ddc77fb949c7aa5e988c318e372c0 (diff)
Merge branch 'master' of https://github.com/adambard/learnxinyminutes-docs into master-cn
Diffstat (limited to 'zh-cn/java-cn.html.markdown')
-rwxr-xr-xzh-cn/java-cn.html.markdown9
1 files changed, 5 insertions, 4 deletions
diff --git a/zh-cn/java-cn.html.markdown b/zh-cn/java-cn.html.markdown
index 4db4e91e..b9ccf61a 100755
--- a/zh-cn/java-cn.html.markdown
+++ b/zh-cn/java-cn.html.markdown
@@ -1,12 +1,13 @@
---
-
+name: java
+category: language
language: java
+lang: zh-cn
+filename: LearnJava.java
contributors:
- ["Jake Prather", "http://github.com/JakeHP"]
translators:
- - ["Chenbo Li", "http://binarythink.net"]
-filename: LearnJava.java
-
+ - ["Chenbo Li", "http://binarythink.net"]
---
Java是一个通用的程序语言, 包含并发, 基于类的面向对象等特性