# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1440576699 -7200
# Node ID a574c668b7999e0fe34cf0087fbe4edb19eac720
# Parent  60c4b60b2945027e72d8a6dd1bd8b758cc87bdc3# Parent  fbf37490216132ccc7356313829ddd9e926c3bff
Automated merge with https://xanthippe.duckdns.org/hg/zsh-env

diff -r 60c4b60b2945 -r a574c668b799 zshrc-cassiopeia
--- a/zshrc-cassiopeia	Fri Aug 21 11:02:43 2015 +0200
+++ b/zshrc-cassiopeia	Wed Aug 26 10:11:39 2015 +0200
@@ -7,6 +7,7 @@
 . $HOME/.zsh-env/zshrc-bindkey
 . $HOME/.zsh-autoenv/autoenv.zsh
 
+export BUILD_NUMBER=0000
 export EXENTRA_WORKSPACE=/home/dirk/Eclipse/Workspaces/Exentra/rpi-git
 export MULE_TEST_OPTS="-Dmule.verbose=false"
 export MULE_TEST_TIMEOUTSECS=9999
@@ -20,9 +21,9 @@
 alias bzip=lbzip2
 alias df="df -h"
 alias env="env | sort | $PAGER"
-alias ex-dist="/home/dirk/Projects/Exentra/RPI/rpi-git/utils/ex-dist"
-alias ex-eclipse="/home/dirk/Projects/Exentra/RPI/rpi-git/utils/ex-eclipse"
-alias ex-install="/home/dirk/Projects/Exentra/RPI/rpi-git/utils/ex-install"
+alias ex-dist="/home/dirk/Projects/Exentra/RPI/rpi/utils/ex-dist"
+alias ex-eclipse="/home/dirk/Projects/Exentra/RPI/rpi/utils/ex-eclipse"
+alias ex-install="/home/dirk/Projects/Exentra/RPI/rpi/utils/ex-install"
 alias ne=neditc
 alias ping=noping
 alias top=htop
diff -r 60c4b60b2945 -r a574c668b799 zshrc-gentoo
--- a/zshrc-gentoo	Fri Aug 21 11:02:43 2015 +0200
+++ b/zshrc-gentoo	Wed Aug 26 10:11:39 2015 +0200
@@ -20,7 +20,7 @@
 alias cd..="cd .."
 alias es="ionice -c3 emerge --sync"
 alias les="less"
-alias wu="emerge -uvDa world"
+alias wu="emerge -tuvDa world"
 alias xm="xmodmap ~/.Xmodmap"
 
 # custom functions for gentoo