Merge branch 'master' of gitorious.org:hunner/hunners-dotfiles

Conflicts:
	.zshrc
This commit is contained in:
Hunter Haugen 2011-04-19 08:34:15 -07:00
commit b662185e7d

6
.zshrc
View file

@ -101,7 +101,11 @@ prompt_precmd() {
#precmd_functions+=prompt_precmd
PROMPT="%m%# "
export LANG="en_US.UTF-8"
if [ `uname -s` = "SunOS" ] ; then
export LANG="C"
else
export LANG="en_US.UTF-8"
fi
#export LC_CTYPE="en_US.UTF-8"
export LC_COLLATE="C" #order files in ls
#export LC_TIME="en_US.UTF-8"