ae7720b9e4e3
merge.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Mon, 08 Mar 2010 10:14:14 -0500 |
| parents | d068bbcd810d (current diff) 68d58637a758 (diff) |
| children | 4df4cde3b0a9 |
| branches/tags | (none) |
| files | .hgrc .hgsubstate |
Changes
--- a/.hgrc Mon Mar 08 10:13:31 2010 -0500 +++ b/.hgrc Mon Mar 08 10:14:14 2010 -0500 @@ -18,7 +18,6 @@ paste = ~/lib/hg/hg-paste/paste.py prompt = ~/lib/hg/hg-prompt/prompt.py histedit = ~/lib/hg/histedit -hgsubversion = ~/lib/hg/hgsubversion/hgsubversion hggit = ~/lib/hg/hg-git/hggit collapse = ~/lib/hg/hgcollapse/hgext/collapse.py review = ~/lib/hg/hg-review/review
--- a/.hgsubstate Mon Mar 08 10:13:31 2010 -0500 +++ b/.hgsubstate Mon Mar 08 10:14:14 2010 -0500 @@ -1,1 +1,1 @@ -37585ce7a3df81ff87e067ae1c7c72073853299c mercurial/templates +a6f3ad9308b55e737256cbd5e4b5dc46fc725e68 mercurial/templates
--- a/.zshrc Mon Mar 08 10:13:31 2010 -0500 +++ b/.zshrc Mon Mar 08 10:14:14 2010 -0500 @@ -30,6 +30,7 @@ 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 PATH="${PATH}:/usr/local/Cellar/python/2.6.4/bin" export WORKON_HOME="${HOME}/lib/virtualenvs" export GREP_OPTIONS='--color=auto' export HISTSIZE=1000