ohmyzsh/templates
Gaetan Semet 4ab34ba94c Merge remote-tracking branch 'cadusk/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2013-12-19 17:27:55 +01:00
..
zshrc-linux.zsh Merge remote-tracking branch 'cadusk/master' 2013-12-19 17:27:55 +01:00
zshrc-mac.zsh Merge remote-tracking branch 'cadusk/master' 2013-12-19 17:27:55 +01:00
zshrc.zsh-template Merge remote-tracking branch 'cadusk/master' 2013-12-19 17:27:55 +01:00