Commit 3fb94d20 authored by Kevin Yank's avatar Kevin Yank

Merge pull request #729 from harrism/master

# By Mark Harris
# Via Mark Harris
* harrism/master:
  Rename "CUDA C/C++" to "CUDA C++"
  Spaces to tabs... :)
  Spaces to tabs... :)
  Tabs to spaces...
  Add missing comma.
  Add CUDA C/C++ name mapping
  Add https://github.com/harrism/sublimetext-cuda-cpp to repositories.json

Conflicts:
	repositories.json
parents 7619ce96 8f3f66a3
...@@ -251,6 +251,7 @@ ...@@ -251,6 +251,7 @@
"https://github.com/gumuz/currentscope", "https://github.com/gumuz/currentscope",
"https://github.com/hairyhum/SublimeStylishHaskell", "https://github.com/hairyhum/SublimeStylishHaskell",
"https://github.com/haraken3/SublimeRubyMotionBuilder", "https://github.com/haraken3/SublimeRubyMotionBuilder",
"https://github.com/harrism/sublimetext-cuda-cpp",
"https://github.com/hdemirchian/CSSFormat", "https://github.com/hdemirchian/CSSFormat",
"https://github.com/henrikpersson/rsub", "https://github.com/henrikpersson/rsub",
"https://github.com/hoest/sublimetext-fsharp", "https://github.com/hoest/sublimetext-fsharp",
...@@ -1078,6 +1079,7 @@ ...@@ -1078,6 +1079,7 @@
"sublimetext-cakephp": "CakePHP (Native)", "sublimetext-cakephp": "CakePHP (Native)",
"SublimeText-CasperJS": "CasperJS", "SublimeText-CasperJS": "CasperJS",
"SublimeText-Crypto": "Crypto", "SublimeText-Crypto": "Crypto",
"sublimetext-cuda-cpp": "CUDA C++",
"sublimetext-date": "Date", "sublimetext-date": "Date",
"sublimetext-fsharp": "F#", "sublimetext-fsharp": "F#",
"sublimetext-grails": "Grails", "sublimetext-grails": "Grails",
......
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