Merged

bluesmoon · Apr 27, 2015 · c3a7afa · c3a7afa
2 parents 63ad0dc + a07f83b
commit c3a7afa
Show file tree

Hide file tree

Showing 25 changed files with 642 additions and 568 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -26,6 +26,9 @@
 		"dot-notation":[2, {"allowKeywords": false}],
 		"space-unary-ops":0,
 		"key-spacing":0,
-		"no-empty":2
+		"no-empty":2,
+		"brace-style": [1, "stroustrup", { "allowSingleLine": true }],
+		"space-after-keywords": [2, "always"],
+		"no-space-before-semi": 0
 	}
 }