# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1360990784 -3600
# Node ID 035e19cbaee79be5be4fe383bb5b360a8d2a09bf
# Parent  2e02d7481487cdf61e00e384af920e8858ebd81c# Parent  2f93381e4ed88f010295833f558645ac1909a94c
merge latest changes

diff -r 2e02d7481487 -r 035e19cbaee7 zshrc
--- a/zshrc	Sat Jan 05 04:38:32 2013 +0100
+++ b/zshrc	Sat Feb 16 05:59:44 2013 +0100
@@ -42,6 +42,9 @@
 # turn of the "helpful" zsh feature of pushing each directory to the dir stack on cd
 unsetopt autopushd
 
+# turn off "helpful" auto correction
+unsetopt correct_all
+
 # utility function that is used by various other modules
 removeFromPath() {
     search_term="$1"
diff -r 2e02d7481487 -r 035e19cbaee7 zshrc-cassiopeia
--- a/zshrc-cassiopeia	Sat Jan 05 04:38:32 2013 +0100
+++ b/zshrc-cassiopeia	Sat Feb 16 05:59:44 2013 +0100
@@ -5,7 +5,6 @@
 . $HOME/.zsh-env/zshrc-jdk
 . $HOME/.zsh-env/zshrc-maven
 . $HOME/.zsh-env/zshrc-bindkey
-#. /usr/local/GNUstep/share/GNUstep/Makefiles/GNUstep.sh
 
 export ANT_HOME=/usr/share/ant-bin
 export EXENTRA_WORKSPACE=/home/dirk/Eclipse/Workspaces/Exentra/trunk