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 /custom/example | |
| 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 'custom/example')
| -rw-r--r-- | custom/example/example.plugin.zsh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/custom/example/example.plugin.zsh b/custom/example/example.plugin.zsh new file mode 100644 index 000000000..406f27445 --- /dev/null +++ b/custom/example/example.plugin.zsh @@ -0,0 +1,2 @@ +# Add your own custom plugins in the custom/plugins directory. Plugins placed +# here will override ones with the same name in the main plugins directory. |