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

Conflicts:
	.gitignore
	lib/directories.zsh
	lib/termsupport.zsh
	lib/theme-and-appearance.zsh
	oh-my-zsh.sh
	plugins/git/git.plugin.zsh
	plugins/osx/osx.plugin.zsh
This commit is contained in:
Sven Lito 2011-04-16 13:20:58 +01:00
commit e0ca1b0f68
52 changed files with 976 additions and 101 deletions

View file

@ -16,7 +16,7 @@ then
_update_zsh_update && return 0;
fi
epoch_diff=$((${_current_epoch} - $LAST_EPOCH))
epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
if [ $epoch_diff -gt 6 ]
then
echo "[Oh My Zsh] Would you like to check for updates?"