diff options
| author | Thomi Richards <thomi.richards@canonical.com> | 2013-12-02 18:21:08 +1300 |
|---|---|---|
| committer | Thomi Richards <thomi.richards@canonical.com> | 2013-12-02 18:21:08 +1300 |
| commit | a279fbd89bf49237368e6bfd22278e79f56a2372 (patch) | |
| tree | 410f2661a989812d0f0aae4861b523db46b3f6d8 /python/subunit/__init__.py | |
| parent | 1ee230bbe58895d769ba5793eae2272b32de10c9 (diff) | |
| parent | d2776fbb08a7edf6c69974586f06888fe94bdff8 (diff) | |
| download | subunit-git-a279fbd89bf49237368e6bfd22278e79f56a2372.tar.gz | |
Merged trunk, fixed conflict.
Diffstat (limited to 'python/subunit/__init__.py')
| -rw-r--r-- | python/subunit/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py index b385e9b..8352585 100644 --- a/python/subunit/__init__.py +++ b/python/subunit/__init__.py @@ -153,7 +153,7 @@ from subunit.v2 import ByteStreamToStreamResult, StreamResultToBytes # If the releaselevel is 'final', then the tarball will be major.minor.micro. # Otherwise it is major.minor.micro~$(revno). -__version__ = (0, 0, 15, 'final', 0) +__version__ = (0, 0, 16, 'final', 0) PROGRESS_SET = 0 PROGRESS_CUR = 1 |