diff options
author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
---|---|---|
committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /contrib/hgweb.wsgi | |
parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
download | mercurial-tarball-4b0aa73b8c69bd5b7521337809f7bc4714209a5a.tar.gz |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'contrib/hgweb.wsgi')
-rw-r--r-- | contrib/hgweb.wsgi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/hgweb.wsgi b/contrib/hgweb.wsgi index c2baf84..8323628 100644 --- a/contrib/hgweb.wsgi +++ b/contrib/hgweb.wsgi @@ -4,8 +4,7 @@ # Path to repo or hgweb config to serve (see 'hg help hgweb') config = "/path/to/repo/or/config" -# Uncomment and adjust if Mercurial is not installed system-wide -# (consult "installed modules" path from 'hg debuginstall'): +# Uncomment and adjust if Mercurial is not installed system-wide: #import sys; sys.path.insert(0, "/path/to/python/lib") # Uncomment to send python tracebacks to the browser if an error occurs: |