Merged public master

This commit is contained in:
Lorenz Meier
2013-08-08 08:32:37 +02:00
4 changed files with 4400 additions and 1 deletions
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
+2 -1
View File
@@ -32,7 +32,8 @@
"settings": "settings":
{ {
"tab_size": 8, "tab_size": 8,
"translate_tabs_to_spaces": false "translate_tabs_to_spaces": false,
"highlight_line": true
}, },
"build_systems": "build_systems":
[ [