Merge branch 'dev-2.0' into 'master'

yanglb · yanglb · commit 22271ac6b1d2 · 2016-05-08T23:28:23.000+08:00
添加git忽略文件



See merge request !1
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+.DS_Store
+*.log
+.svn/
+bin/
+out/
+

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +.DS_Store
 +*.log
 +.svn/
 +bin/
 +out/
++