Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	tools/install.sh
This commit is contained in:
Nicolas McCurdy 2012-06-22 11:15:04 -04:00
commit 034af226f6
30 changed files with 218 additions and 44 deletions

View file

@ -23,7 +23,7 @@ then
fi
epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
if [ $epoch_diff -gt 6 ]
if [ $epoch_diff -gt 13 ]
then
if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
then