Commit Graph

3 Commits

Author SHA1 Message Date
Sorin Ionescu
b65195156d Added missing FX and named colors to spectrum. 2012-01-23 20:40:39 -05:00
Sorin Ionescu
90e7debc30 Cleaned up the plugins. 2012-01-23 20:40:15 -05:00
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