# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1267462068 18000
# Node ID c7536eed5cc86e42e578323e64165f01ebd958a3
# Parent  ed5d800d4a8aae539e2258875c23fd83be4cf076# Parent  c4483b80c57200eddbd3d08d0a988692c5ac2816
Merge with personal settings.

diff -r ed5d800d4a8a -r c7536eed5cc8 .hgrc
--- a/.hgrc	Mon Mar 01 11:45:01 2010 -0500
+++ b/.hgrc	Mon Mar 01 11:47:48 2010 -0500
@@ -102,7 +102,7 @@
 i. = incoming -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
 
 sglog = glog --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
-, = sglog -l10
+, = sglog -l7
 ,, = , -l100000000
 o, = outgoing --graph --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
 i, = incoming --graph --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
@@ -110,3 +110,5 @@
 nlog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.nlog
 n = nlog -vr
 show = nlog --color=always -vpr
+
+qcm = qcommit -m 
diff -r ed5d800d4a8a -r c7536eed5cc8 .zshrc
--- a/.zshrc	Mon Mar 01 11:45:01 2010 -0500
+++ b/.zshrc	Mon Mar 01 11:47:48 2010 -0500
@@ -27,6 +27,7 @@
 export PATH="/usr/local/bin:/usr/local/sbin:$HOME/lib/fmscripts:$HOME/bin:$PATH"
 export PATH="$HOME/.gem/ruby/1.8/bin:${PATH}"
 export PATH="/opt/subversion/bin:${PATH}"
+export PATH="${PATH}:/usr/local/Cellar/PyPi/3.6/bin"
 export WORKON_HOME="${HOME}/lib/virtualenvs"
 export GREP_OPTIONS='--color=auto'
 export HISTSIZE=1000
@@ -40,7 +41,7 @@
 
 # Mercurial variables --------------------------------------------------------
 export PATH="$HOME/lib/hg/hg-stable:$PATH"
-export PYTHONPATH="$HOME/lib/hg/hg-stable:$PYTHONPATH"
+export PYTHONPATH="$HOME/lib/hg/hg-stable:/usr/local/lib/python2.6/site-packages:$PYTHONPATH"
 
 # Extra shell extensions like z and tab completion for Mercurial -------------
 source ~/lib/z/z.sh