Commit Graph

3 Commits

Author SHA1 Message Date
Sorin Ionescu
ba9900a488 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Conflicts:
	.gitignore
	lib/aliases.zsh
	lib/completion.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/key-bindings.zsh
	lib/misc.zsh
	lib/spectrum.zsh
	plugins/git/git.plugin.zsh
	plugins/osx/_man-preview
	plugins/osx/osx.plugin.zsh
	plugins/svn/svn.plugin.zsh
	templates/zshrc.zsh-template
	themes/lukerandall.zsh-theme
	themes/philips.zsh-theme
	tools/upgrade.sh
2011-08-26 02:58:19 -04:00
Theodore Robert Campbell Jr
477749a0af ssh-agent plugin now ends in "-$HOST" so an agent is started properly with nfs shared homes. 2011-03-01 00:21:49 -05:00
Robby Russell
be63480e22 Reorganizing plugins so that each plugin has it's own directory now so that any plugin-specific functions can be bundled within there. 2010-09-30 21:34:06 -07:00