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 /.gitignore | |
| 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 '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8d19d100c..2e8db7341 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ locals.zsh log/.zsh_history projects.zsh custom/* -!custom/example.zsh
\ No newline at end of file +!custom/example +!custom/example.zsh +cache +*.swp |