Added .editorconfig and travis CI badge

yanyunlong · Dec 11, 2012 · 55d02cf · 55d02cf
1 parent e77dd30
commit 55d02cf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,11 @@
+# editorconfig.org - unify code style
+# plugins for text editors: editorconfig.org/#download
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
-VideoJS - [HTML5 Video Player](http://videojs.com)
+[Video.js - HTML5 Video Player](http://videojs.com)[![Build Status](https://travis-ci.org/zencoder/video-js.png?branch=master)](https://travis-ci.org/zencoder/video-js)
 ==================================================
-Version 3.0 BETA
 
 Visit the main site at [videojs.com](http://videojs.com) for download options and instructions.