~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-15 04:01:26 UTC
  • mfrom: (4734.3.1 2.1.0b1)
  • mto: This revision was merged to the branch mainline in revision 4747.
  • Revision ID: john@arbash-meinel.com-20091015040126-a0aeamcjsjeredvv
Merge the 2.1.0b1 branch.

Update NEWS to handle the various cases got shuffled around,
including moving 'in progress' stuff up into the current development
section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
45
45
# releaselevel of 'dev' for unreleased under-development code.
46
46
 
47
 
version_info = (2, 1, 0, 'dev', 0)
 
47
version_info = (2, 1, 0, 'dev', 2)
48
48
 
49
49
# API compatibility version: bzrlib is currently API compatible with 1.15.
50
50
api_minimum_version = (2, 1, 0)