Merge branch 'master' into theming

Conflicts:
	templates/zshrc.arch-zsh-template
	templates/zshrc.zsh-template
This commit is contained in:
Simon Gomizelj 2011-11-28 14:00:26 -05:00
commit 8b5d590249
3 changed files with 22 additions and 1 deletions

View file

@ -29,6 +29,5 @@ load_oh_my_zshell
# Load a theme
# Look in /usr/local/share/oh-my-zsh/themes/
set_theme "arch-blue"
# random_theme
# Customize to your needs...