← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Robert J. Tanner
  • Date: 2009-06-09 16:41:46 UTC
  • mto: (4360.5.3 1.15)
  • mto: This revision was merged to the branch mainline in revision 4425.
  • Revision ID: tanner@real-time.com-20090609164146-yvdj5rqmoxi1y9t5
Resolved conflict and clean up NEWS file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
50
50
# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
51
51
# releaselevel of 'dev' for unreleased under-development code.
52
52
 
53
 
version_info = (1, 15, 0, 'final', 0)
 
53
version_info = (1, 15, 0, 'candidate', 1)
54
54
 
55
55
# API compatibility version: bzrlib is currently API compatible with 1.13.
56
56
api_minimum_version = (1, 15, 0)