Merge commit 'b7cdb'

Conflicts: .gitmodules
altdev · May 7, 2012 · c5307c8 · c5307c8
2 parents 0cc188c + b7cdb06
commit c5307c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -60,3 +60,6 @@
 [submodule "vim/bundle/ctrlp.vim"]
 	path = vim/bundle/ctrlp.vim
 	url = https://github.com/kien/ctrlp.vim.git
+[submodule "vim/bundle/vim-coffee-script"]
+	path = vim/bundle/vim-coffee-script
+	url = https://github.com/kchmck/vim-coffee-script.git
diff --git a/vim/bundle/vim-coffee-script b/vim/bundle/vim-coffee-script