Merge branch 'master' of https://github.com/wbond/package_control_channel

channel.json

@@ -107,7 +107,6 @@
 		"https://raw.github.com/sentience/HyperlinkHelper/master/packages.json",
 		"https://raw.github.com/shivkumarganesh/VisSub/master/packages.json",
 		"https://raw.github.com/Skullmonkey/sublime/master/packages.json",
-		"https://raw.github.com/smpanaro/sublime-spotify/master/packages.json",
 		"https://raw.github.com/sokolovstas/SublimeWebInspector/master/packages.json",
 		"https://raw.github.com/soncy/AutoComments-for-Sublime-Text-2/master/packages.json",
 		"https://raw.github.com/SublimeCodeIntel/SublimeCodeIntel/master/packages.json",

repository/c.json

@@ -470,6 +470,17 @@
 				}
 			]
 		},
+		{
+			"name": "Clang Format",
+			"details": "https://github.com/rosshemsley/SublimeClangFormat",
+			"labels": ["Clang", "Format", "Beautifier", "Formatter", "C", "C++"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"details": "https://github.com/rosshemsley/SublimeClangFormat/tags"
+				}
+			]
+		},
 		{
 			"name": "Clarion",
 			"details": "https://github.com/fushnisoft/SublimeClarion",

repository/m.json

@@ -342,6 +342,18 @@
 				}
 			]
 		},
+		{
+			"name": "MediaPlayer",
+			"details": "https://github.com/Monnoroch/SublimePlayer",
+			"readme": "https://github.com/Monnoroch/SublimePlayer/blob/master/README.md",
+			"labels": ["media"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"details": "https://github.com/Monnoroch/SublimePlayer/tree/master"
+				}
+			]
+		},
 		{
 			"details": "https://github.com/tosher/Mediawiker",
 			"releases": [

repository/s.json

@@ -1384,6 +1384,19 @@
 				}
 			]
 		},
+		{
+			"name": "Spotify",
+			"previous_names": ["Spotify Control"],
+			"details": "https://github.com/smpanaro/sublime-spotify",
+			"labels": ["music"],
+			"releases": [
+				{
+					"platforms": "osx",
+					"sublime_text": "*",
+					"details": "https://github.com/smpanaro/sublime-spotify/tags"
+				}
+			]
+		},
 		{
 			"name": "SproutCore Snippets and JSHint Integration",
 			"details": "https://github.com/sproutcore/sproutcore-sublime-text-2-package",