← Back to branch summary

~testing-cabal/debian/sid/subunit/daily-builds

~testing-cabal/debian/sid/subunit/daily-builds

Viewing all changes in revision 101.

Committer: Robert Collins
Date: 2011-05-03 01:11:28 UTC
mfrom: (64.20.60 trunk)
Revision ID: robertc@robertcollins.net-20110503011128-mqm6hr2qmjllye81

Merge trunk to resolve conflict on setup.py - bad auto-merge?

files added:
setup.py

files modified:
INSTALL

NEWS

README

c/include/subunit/child.h

c/lib/child.c

c/tests/test_child.c

filters/subunit-filter

filters/subunit-ls

python/subunit/__init__.py

python/subunit/chunked.py

python/subunit/details.py

python/subunit/iso8601.py

python/subunit/run.py

python/subunit/test_results.py

python/subunit/tests/TestUtil.py

python/subunit/tests/sample-script.py

python/subunit/tests/test_chunked.py

python/subunit/tests/test_details.py

python/subunit/tests/test_subunit_filter.py

python/subunit/tests/test_subunit_stats.py

python/subunit/tests/test_subunit_tags.py

python/subunit/tests/test_tap2subunit.py

python/subunit/tests/test_test_protocol.py

python/subunit/tests/test_test_results.py

Show diffs side-by-side

added added

removed removed

c/include/subunit/child.h

c/tests/test_child.c

filters/subunit-filter

filters/subunit-ls

python/subunit/__init__.py

python/subunit/chunked.py

python/subunit/details.py

python/subunit/iso8601.py

python/subunit/run.py

python/subunit/test_results.py

python/subunit/tests/TestUtil.py

python/subunit/tests/sample-script.py

python/subunit/tests/test_chunked.py

python/subunit/tests/test_details.py

python/subunit/tests/test_subunit_filter.py

python/subunit/tests/test_subunit_stats.py

python/subunit/tests/test_subunit_tags.py

python/subunit/tests/test_tap2subunit.py

python/subunit/tests/test_test_protocol.py

python/subunit/tests/test_test_results.py

Older »