Merge remote-tracking branch 'upstream/master' into emacs
Conflicts: plugins/emacs/emacs.plugin.zsh plugins/emacs/emacsclient.sh
themes/nebirhos.zsh-theme
0 → 100644
themes/norm.zsh-theme
0 → 100644
themes/obraun.zsh-theme
0 → 100644
themes/re5et.zsh-theme
0 → 100644
themes/simple.zsh-theme
0 → 100644
themes/smt.zsh-theme
0 → 100644
themes/steeef.zsh-theme
0 → 100644
themes/sunaku.zsh-theme
0 → 100644
themes/sunrise.zsh-theme
0 → 100644
themes/superjarin.zsh-theme
0 → 100644
themes/trapd00r.zsh-theme
0 → 100644
themes/wedisagree.zsh-theme
0 → 100644
themes/wuffers.zsh-theme
0 → 100644
tools/theme_chooser.sh
0 → 100755
Please register or sign in to comment