Permalink
Browse files

Merge remote branch 'origin/master' into windows

  • Loading branch information...
2 parents d6e3ecc + 4a00b30 commit c3fa22dc6b4c7d548a5f6d48ce1460ab7a1a4b0c @neocotic neocotic committed Mar 29, 2013
Showing with 55 additions and 22 deletions.
  1. +55 −22 resources/languages.json
@@ -1,23 +1,56 @@
-{ ".coffee": {"name": "coffeescript", "symbol": "#"},
- ".litcoffee": {"name": "coffeescript", "symbol": "#", "literate": true},
- "Cakefile": {"name": "coffeescript", "symbol": "#"},
- ".rb": {"name": "ruby", "symbol": "#"},
- ".py": {"name": "python", "symbol": "#"},
- ".tex": {"name": "tex", "symbol": "%"},
- ".latex": {"name": "tex", "symbol": "%"},
- ".js": {"name": "javascript", "symbol": "//"},
- ".java": {"name": "java", "symbol": "//"},
- ".scss": {"name": "scss", "symbol": "//"},
- ".h": {"name": "objectivec", "symbol": "//"},
- ".cpp": {"name": "cpp", "symbol": "//"},
- ".php": {"name": "php", "symbol": "//"},
- ".hs": {"name": "haskell", "symbol": "--"},
- ".erl": {"name": "erlang", "symbol": "%"},
- ".hrl": {"name": "erlang", "symbol": "%"},
- ".md": {"name": "markdown", "symbol": ""},
- ".markdown": {"name": "markdown", "symbol": ""},
- ".less": {"name": "scss", "symbol": "//"},
- ".m": {"name": "objectivec", "symbol": "//"},
- ".scala": {"name": "scala", "symbol": "//"},
- ".cs": {"name": "cs", "symbol": "//"}
+{ ".coffee": {"name": "coffeescript", "symbol": "#"},
+ ".litcoffee": {"name": "coffeescript", "symbol": "#", "literate": true},
+ "Cakefile": {"name": "coffeescript", "symbol": "#"},
+ ".rb": {"name": "ruby", "symbol": "#"},
+ ".py": {"name": "python", "symbol": "#"},
+ ".tex": {"name": "tex", "symbol": "%"},
+ ".latex": {"name": "tex", "symbol": "%"},
+ ".js": {"name": "javascript", "symbol": "//"},
+ ".java": {"name": "java", "symbol": "//"},
+ ".scss": {"name": "scss", "symbol": "//"},
+ ".cpp": {"name": "cpp", "symbol": "//"},
+ ".php": {"name": "php", "symbol": "//"},
+ ".hs": {"name": "haskell", "symbol": "--"},
+ ".erl": {"name": "erlang", "symbol": "%"},
+ ".hrl": {"name": "erlang", "symbol": "%"},
+ ".md": {"name": "markdown", "symbol": ""},
+ ".markdown": {"name": "markdown", "symbol": ""},
+ ".less": {"name": "scss", "symbol": "//"},
+ ".h": {"name": "objectivec", "symbol": "//"},
+ ".m": {"name": "objectivec", "symbol": "//"},
+ ".mm": {"name": "objectivec", "symbol": "//"},
+ ".scala": {"name": "scala", "symbol": "//"},
+ ".cs": {"name": "cs", "symbol": "//"},
+ ".as": {"name": "actionscript", "symbol": "//"},
+ ".scpt": {"name": "applescript", "symbol": "--"},
+ ".applescript": {"name": "applescript", "symbol": "--"},
+ ".sh": {"name": "bash", "symbol": "#"},
+ ".clj": {"name": "clojure", "symbol": ";"},
+ ".cmake": {"name": "cmake", "symbol": "#"},
+ ".d": {"name": "d", "symbol": "//"},
+ ".p": {"name": "delphi", "symbol": "//"},
+ ".pp": {"name": "delphi", "symbol": "//"},
+ ".pas": {"name": "delphi", "symbol": "//"},
+ ".bat": {"name": "dos", "symbol": "@?rem"},
+ ".btm": {"name": "dos", "symbol": "@?rem"},
+ ".cmd": {"name": "dos", "symbol": "@?rem"},
+ ".go": {"name": "go", "symbol": "//"},
+ ".ini": {"name": "ini", "symbol": ";"},
+ ".lisp": {"name": "lisp", "symbol": ";"},
+ ".mel": {"name": "mel", "symbol": "//"},
+ ".pl": {"name": "perl", "symbol": "#"},
+ ".pm": {"name": "perl", "symbol": "#"},
+ ".pod": {"name": "perl", "symbol": "#"},
+ ".t": {"name": "perl", "symbol": "#"},
+ ".r": {"name": "r", "symbol": "#"},
+ ".rc": {"name": "rust", "symbol": "//"},
+ ".rs": {"name": "rust", "symbol": "//"},
+ ".sql": {"name": "sql", "symbol": "--"},
+ ".vala": {"name": "vala", "symbol": "//"},
+ ".vapi": {"name": "vala", "symbol": "//"},
+ ".vbe": {"name": "vbscript", "symbol": "'"},
+ ".vbs": {"name": "vbscript", "symbol": "'"},
+ ".wsc": {"name": "vbscript", "symbol": "'"},
+ ".wsf": {"name": "vbscript", "symbol": "'"},
+ ".vhdl": {"name": "vhdl", "symbol": "--"}
}

0 comments on commit c3fa22d

Please sign in to comment.