prezto

Commit Graph

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	13 years ago

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

1 Commits (b52adc8373e3696603d379d2fef48eff316cb967)