diff options
| author | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
|---|---|---|
| committer | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
| commit | db90589c8a02e98e657af17bb0b460b752d9ed61 (patch) | |
| tree | d1354a9338bf9921ad0f66d2f5394272e1cfec77 /plugins/pip | |
| parent | 7066bf7c6b522af9147ebf03c00361c4c6490d42 (diff) | |
| parent | 57f04b921ea1c12a0a283331778848cd4011bf21 (diff) | |
| download | zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.gz zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.bz2 zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.zip | |
Merge remote-tracking branch 'upstream/master' into emacs
Conflicts:
plugins/emacs/emacs.plugin.zsh
plugins/emacs/emacsclient.sh
Diffstat (limited to 'plugins/pip')
| -rw-r--r-- | plugins/pip/pip.plugin.zsh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh deleted file mode 100644 index bf9f23968..000000000 --- a/plugins/pip/pip.plugin.zsh +++ /dev/null @@ -1,4 +0,0 @@ -# add brew completion function to path -fpath=($ZSH/plugins/pip $fpath) -autoload -U compinit -compinit -i |