summaryrefslogtreecommitdiff
path: root/mercurial/__version__.py
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-27 14:30:31 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-27 14:30:31 +0100
commit4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch)
tree75f4c36771caf222280249cd1ed611d5ade8bd48 /mercurial/__version__.py
parent59a96880b5d035db83067acda8345497c75d7716 (diff)
parent921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff)
downloadmercurial-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 'mercurial/__version__.py')
-rw-r--r--mercurial/__version__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mercurial/__version__.py b/mercurial/__version__.py
index 74c95c5..a0ed182 100644
--- a/mercurial/__version__.py
+++ b/mercurial/__version__.py
@@ -1,2 +1,2 @@
# this file is autogenerated by setup.py
-version = "2.3"
+version = "1.9.3"