ohmyzsh/templates
Gaetan Semet b964433381 Merge branch 'master' of https://github.com/Stibbons/oh-my-zsh
Conflicts:
	README.textile
	custom/plugins/launch_trial/_launch_trial.sh
	plugins/encode64/encode64.plugin.zsh
	plugins/git/git.plugin.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
	tools/install.sh

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-03-27 16:51:05 +01:00
..
zshrc-linux.zsh updating scripts 2013-03-27 10:15:10 +01:00
zshrc-mac.zsh disable ssh-agent. 2013-03-27 10:10:33 +01:00
zshrc.zsh-template Merge branch 'master' of https://github.com/Stibbons/oh-my-zsh 2013-03-27 16:51:05 +01:00