Commit 5514f767 authored by joneshf's avatar joneshf

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

Conflicts:
	repositories.json
parents 7456929b 4d77d90a
...@@ -805,6 +805,7 @@ ...@@ -805,6 +805,7 @@
"https://github.com/randy3k/AlignTab", "https://github.com/randy3k/AlignTab",
"https://github.com/randy3k/AutoWrap", "https://github.com/randy3k/AutoWrap",
"https://github.com/randy3k/ChangeList", "https://github.com/randy3k/ChangeList",
"https://github.com/randy3k/Enhanced-R",
"https://github.com/rareyman/HTMLBeautify", "https://github.com/rareyman/HTMLBeautify",
"https://github.com/raulfraile/sublime-symfony2", "https://github.com/raulfraile/sublime-symfony2",
"https://github.com/raydric/raydric-color-scheme", "https://github.com/raydric/raydric-color-scheme",
...@@ -1174,7 +1175,6 @@ ...@@ -1174,7 +1175,6 @@
"https://raw.github.com/quarnster/CompleteSharp/master/package.json", "https://raw.github.com/quarnster/CompleteSharp/master/package.json",
"https://raw.github.com/quarnster/SublimeClang/master/package.json", "https://raw.github.com/quarnster/SublimeClang/master/package.json",
"https://raw.github.com/quarnster/SublimeJava/master/package.json", "https://raw.github.com/quarnster/SublimeJava/master/package.json",
"https://raw.github.com/raymondkww/R-sublime/master/packages.json",
"https://raw.github.com/recklesswaltz/Subtoise/master/packages.json", "https://raw.github.com/recklesswaltz/Subtoise/master/packages.json",
"https://raw.github.com/relikd/plist-binary_sublime/master/packages.json", "https://raw.github.com/relikd/plist-binary_sublime/master/packages.json",
"https://raw.github.com/robcowie/SublimeTODO/master/packages.json", "https://raw.github.com/robcowie/SublimeTODO/master/packages.json",
...@@ -2074,6 +2074,7 @@ ...@@ -2074,6 +2074,7 @@
"Change List (Last Edit)": "ChangeList", "Change List (Last Edit)": "ChangeList",
"DocBlox": "phpDocumentor", "DocBlox": "phpDocumentor",
"EE Add-On Builder": "ExpressionEngine Add-On Builder", "EE Add-On Builder": "ExpressionEngine Add-On Builder",
"Enhanced R" : "Enhanced-R",
"Find Function Definiton": "Find Function Definition", "Find Function Definiton": "Find Function Definition",
"Frontend Delight Theme": "Color Scheme - Frontend Delight", "Frontend Delight Theme": "Color Scheme - Frontend Delight",
"Git Gutter": "GitGutter", "Git Gutter": "GitGutter",
......
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