ohmyzsh/templates
Gaetan Semet cf1c065d71 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2014-10-07 11:53:12 +02:00
..
zshrc-linux.zsh Merge remote-tracking branch 'cadusk/master' 2014-10-07 11:53:12 +02:00
zshrc-mac.zsh Merge remote-tracking branch 'cadusk/master' 2014-10-07 11:53:12 +02:00
zshrc.zsh-template Merge remote-tracking branch 'upstream/master' 2014-07-03 16:18:02 +02:00