ohmyzsh/templates
Gaetan Semet 92ed38cb85 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	tools/install.sh
2014-03-24 11:56:16 +01:00
..
zshrc-linux.zsh Merge remote-tracking branch 'cadusk/master' 2014-03-24 11:56:16 +01:00
zshrc-mac.zsh Merge remote-tracking branch 'cadusk/master' 2014-03-24 11:56:16 +01:00
zshrc.zsh-template Merge remote-tracking branch 'upstream/master' 2014-03-24 11:54:41 +01:00