← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
55
55
# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
56
56
# releaselevel of 'dev' for unreleased under-development code.
57
57
 
58
 
version_info = (2, 5, 1, 'dev', 0)
 
58
version_info = (2, 5, 2, 'dev', 0)
59
59
 
60
60
# API compatibility version
61
61
api_minimum_version = (2, 4, 0)