Permalink
Browse files

Added .editorconfig and travis CI badge

  • Loading branch information...
1 parent e77dd30 commit 55d02cf6d87caea72edd2c383d72ac658bf6b888 Steve Heffernan committed Dec 11, 2012
Showing with 12 additions and 2 deletions.
  1. +11 −0 .editorconfig
  2. +1 −2 README.md
View
@@ -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
View
@@ -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.

1 comment on commit 55d02cf

@Loranslorans

@@ -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

Please sign in to comment.