Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-03-24 11:54:41 +01:00
commit 5afa441d66
36 changed files with 2060 additions and 103 deletions

View file

@ -1,5 +1,5 @@
# Path to your oh-my-zsh configuration.
ZSH=$HOME/.oh-my-zsh
# Path to your oh-my-zsh installation.
export ZSH=$HOME/.oh-my-zsh
# Set name of the theme to load.
# Look in ~/.oh-my-zsh/themes/ (show features by tools/list_theme.sh)
@ -42,6 +42,9 @@ DISABLE_CORRECTION="true"
# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
# HIST_STAMPS="mm/dd/yyyy"
# Would you like to use another custom folder than $ZSH/custom?
# ZSH_CUSTOM=/path/to/new-custom-folder
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)