Merge branch 'opencl' of https://github.com/Milania1/prism into Milan…

…ia1-opencl # Conflicts: # plugins/autoloader/prism-autoloader.js # plugins/autoloader/prism-autoloader.min.js # plugins/show-language/prism-show-language.js # plugins/show-language/prism-show-language.min.js
PrismJS · Sep 16, 2017 · 5ac0afb · 5ac0afb
2 parents 2e43fcf + b704486
commit 5ac0afb
Show file tree

Hide file tree

Showing 16 changed files with 2,745 additions and 4 deletions.
diff --git a/components.js b/components.js
@@ -380,6 +380,11 @@ var components = {
 			"title": "OCaml",
 			"owner": "Golmote"
 		},
+		"opencl": {
+			"title": "OpenCL",
+			"require": "cpp",
+			"owner": "Milania1"
+		},
 		"oz": {
 			"title": "Oz",
 			"owner": "Golmote"

diff --git a/components/prism-opencl.js b/components/prism-opencl.js