Commit 13a22db4 authored by joneshf's avatar joneshf

Merge branch 'master' of github.com:sproutcore/package_control_channel into sproutcore-master

Conflicts:
	repositories.json
parents b861efa0 a0179589
......@@ -960,6 +960,7 @@
"https://github.com/speilberg0/SublimeToggleCssFormat",
"https://github.com/splatzgud/VGR-Assistant",
"https://github.com/sporto/rails_go_to_spec",
"https://github.com/sproutcore/sproutcore-sublime-text-2-package",
"https://github.com/squ1b3r/Djaneiro",
"https://github.com/srilumpa/SyntaxChecker",
"https://github.com/standfast/Translate",
......@@ -1551,6 +1552,7 @@
"Solarized": "Solarized Color Scheme",
"sourcetalk_st2": "SoucreTalk (real time code discussions)",
"SPARC-sublime": "SPARC Assembly",
"sproutcore-sublime-text-2-package": "SproutCore Snippets and JSHint Integration",
"ST-FutureFunk": "Future Funk - Color Scheme",
"ST2-Backbone.Marionette": "Backbone.Marionette",
"ST2-CommandOnSave": "CommandOnSave",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment