Commit graph

4 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
Sorin Ionescu 94ab5e0ec8 Cleaned up lib/ and removed trailing white space everywhere.
Conflicts:

	oh-my-zsh.sh
2011-06-01 02:48:26 -04:00
Pat Regan b003fc59a4 redis-cli.plugin.zsh removed, adding to the fpath isn't needed now 2011-04-27 19:46:23 -04:00
alexandru 1e784edb04 redis-cli completion plugin 2011-04-14 16:22:18 -07:00