← Back to branch summary

~testtools-dev/testtools/trunk

~testtools-dev/testtools/trunk

Viewing all changes in revision 219.3.4.

Committer: Jonathan Lange
Date: 2011-08-09 13:12:39 UTC
mfrom: (224 trunk)
mto: This revision was merged to the branch mainline in revision 225.
Revision ID: jml@canonical.com-20110809131239-4iap2fg68ok17cpn

Merge trunk. Resolve conflicts.

files removed:
doc/news.rst

files modified:
Makefile

NEWS

testtools/matchers.py

testtools/tests/__init__.py

testtools/tests/helpers.py

testtools/tests/test_helpers.py

testtools/tests/test_matchers.py

testtools/tests/test_testresult.py

testtools/tests/test_testsuite.py

testtools/tests/test_with_with.py

Show diffs side-by-side

added added

removed removed

testtools/matchers.py

testtools/tests/__init__.py

testtools/tests/helpers.py

testtools/tests/test_helpers.py

testtools/tests/test_matchers.py

testtools/tests/test_testresult.py

testtools/tests/test_testsuite.py

testtools/tests/test_with_with.py

Older »