Skip to content

Commit

Permalink
Merge remote branch 'upstream/master' into windows
Browse files Browse the repository at this point in the history
  • Loading branch information
neocotic committed Mar 27, 2013
2 parents 8c395e1 + c750d31 commit fb1439c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions resources/languages.json
Expand Up @@ -24,5 +24,6 @@
".m": {"name": "objc", "symbol": "//"},
".scala": {"name": "scala", "symbol": "//"},
".cs": {"name": "c#", "symbol": "//"},
".scm": {"name": "scheme", "symbol": ";;"},
"Makefile": {"name": "make", "symbol": "#"}
}

0 comments on commit fb1439c

Please sign in to comment.