~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-27 15:20:55 UTC
  • mfrom: (6476.1.1 dev_2.5_integration)
  • Revision ID: pqm@pqm.ubuntu.com-20120227152055-sw2fya70kpfk3h4y
(gz) Merge 2.5 for fixes to texinfo doc script and btree tests (Martin
 Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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, 6, 0, 'dev', 1)
59
59
 
60
60
# API compatibility version
61
61
api_minimum_version = (2, 4, 0)