Merge branch 'dev' of github.com:davidhalter/jedi into dev

2013-06-20 11:27:08 +02:00
parent aa5bb539c1 5de63873df
commit 7509c239ec
8 changed files with 81 additions and 10 deletions
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -45,9 +45,18 @@ Resources
 Editor Plugins
 --------------

- `Vim <http://github.com/davidhalter/jedi-vim>`_
- `Emacs <https://github.com/tkf/emacs-jedi>`_
- `Sublime Text 2 <https://github.com/svaiter/SublimeJEDI>`_
+Vim:
+
+- `jedi-vim <http://github.com/davidhalter/jedi-vim>`_
+- `YouCompleteMe <http://valloric.github.io/YouCompleteMe/>`_
+
+Emacs:
+
+- `Jedi.el <https://github.com/tkf/emacs-jedi>`_
+
+Sublime Text 2:
+
+- `SublimeJEDI <https://github.com/svaiter/SublimeJEDI>`_


 .. _other-software: