← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-19 12:08:42 UTC
  • mfrom: (6437.3.8 2.5)
  • mto: (6437.3.14 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120119120842-xlq5ru2cqfcurnk9
Merge lp:bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
46
46
IGNORE_FILENAME = ".bzrignore"
47
47
 
48
48
 
49
 
__copyright__ = "Copyright 2005-2011 Canonical Ltd."
 
49
__copyright__ = "Copyright 2005-2012 Canonical Ltd."
50
50
 
51
51
# same format as sys.version_info: "A tuple containing the five components of
52
52
# the version number: major, minor, micro, releaselevel, and serial. All
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, 0, 'dev', 5)
 
58
version_info = (2, 5, 0, 'dev', 6)
59
59
 
60
60
# API compatibility version
61
61
api_minimum_version = (2, 4, 0)