← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-12 17:28:39 UTC
  • mfrom: (1551.15.22 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
Fix botched merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
35
35
# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
36
36
# releaselevel of 'dev' for unreleased under-development code.
37
37
 
38
 
version_info = (0, 17, 0, 'dev', 0)
 
38
version_info = (0, 18, 0, 'dev', 0)
39
39
 
40
40
if version_info[3] == 'final':
41
41
    version_string = '%d.%d.%d' % version_info[:3]