Permalink
Browse files

Merge remote branch 'origin/master' into windows

  • Loading branch information...
2 parents 53b47f4 + 01100bd commit 36570c6fa579eae1fbb979ed9a684177a5f336a6 @neocotic neocotic committed Mar 27, 2013
Showing with 4 additions and 10 deletions.
  1. +4 −10 resources/languages.json
View
@@ -1,18 +1,14 @@
{ ".coffee": {"name": "coffeescript", "symbol": "#"},
".litcoffee": {"name": "coffeescript", "symbol": "#", "literate": true},
- ".ls": {"name": "livescript", "symbol": "#"},
+ "Cakefile": {"name": "coffeescript", "symbol": "#"},
".rb": {"name": "ruby", "symbol": "#"},
".py": {"name": "python", "symbol": "#"},
- ".feature": {"name": "gherkin", "symbol": "#"},
- ".yaml": {"name": "yaml", "symbol": "#"},
".tex": {"name": "tex", "symbol": "%"},
".latex": {"name": "tex", "symbol": "%"},
".js": {"name": "javascript", "symbol": "//"},
".java": {"name": "java", "symbol": "//"},
- ".sass": {"name": "sass", "symbol": "//"},
".scss": {"name": "scss", "symbol": "//"},
- ".c": {"name": "c", "symbol": "//"},
- ".h": {"name": "c", "symbol": "//"},
+ ".h": {"name": "objectivec", "symbol": "//"},
".cpp": {"name": "cpp", "symbol": "//"},
".php": {"name": "php", "symbol": "//"},
".hs": {"name": "haskell", "symbol": "--"},
@@ -21,9 +17,7 @@
".md": {"name": "markdown", "symbol": ""},
".markdown": {"name": "markdown", "symbol": ""},
".less": {"name": "scss", "symbol": "//"},
- ".m": {"name": "objc", "symbol": "//"},
+ ".m": {"name": "objectivec", "symbol": "//"},
".scala": {"name": "scala", "symbol": "//"},
- ".cs": {"name": "c#", "symbol": "//"},
- ".scm": {"name": "scheme", "symbol": ";;"},
- "Makefile": {"name": "make", "symbol": "#"}
+ ".cs": {"name": "cs", "symbol": "//"}
}

0 comments on commit 36570c6

Please sign in to comment.