]> git.donarmstrong.com Git - zsh.git/commit
Merge remote-tracking branch 'madduck/master'
authorDon Armstrong <don@donarmstrong.com>
Sun, 21 Sep 2014 22:20:08 +0000 (15:20 -0700)
committerDon Armstrong <don@donarmstrong.com>
Sun, 21 Sep 2014 22:20:08 +0000 (15:20 -0700)
commit929a2738768030f0e46f3c13a26d9cde7cd38c62
tree6e1342f7a28ed789c7e8df27c74ce371c948ceac
parent47e33e38ed0ae2e2d57b506399e1feeee7f2f026
parentd6a2e5acc380c42f9e74615a46513afaab15cf7e
Merge remote-tracking branch 'madduck/master'

Conflicts:
.zsh/zshrc/30_aliases
.zsh/zshrc/79_bindkeys
.zsh/zshrc/30_aliases
.zsh/zshrc/60_vcsprompt
.zsh/zshrc/79_bindkeys
.zsh/zshrc/85_prompt