changeset 106:f919d3bf3744

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 07 May 2012 22:15:59 -0700
parents c129a719560f (diff) a755319f124e (current diff)
children 82240fa8b618 5bd55d06cf75
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bashrc/bashrc	Mon May 07 17:13:56 2012 -0700
+++ b/bashrc/bashrc	Mon May 07 22:15:59 2012 -0700
@@ -11,8 +11,8 @@
 # Mac developer binaries
 PATH=/Developer/usr/bin:$PATH
 
-# PATH for Python 2.7
-PATH=/Library/Frameworks/Python.framework/Versions/2.7/bin:$PATH
+# Python from Homebrew
+PATH=/usr/local/share/python:$PATH
 
 # Done!
 export PATH
--- a/hgrc/hgrc	Mon May 07 17:13:56 2012 -0700
+++ b/hgrc/hgrc	Mon May 07 22:15:59 2012 -0700
@@ -12,6 +12,7 @@
 purge =
 fetch =
 record =
+rebase =
 convert =
 extdiff =
 schemes =