← Back to branch summary

~andrewsomething/bzr-builddeb/bzr-grab-merge

~andrewsomething/bzr-builddeb/bzr-grab-merge

Viewing all changes in revision 416.

Committer: Andrew Starr-Bochicchio
Date: 2011-12-20 18:13:17 UTC
mfrom: (393.1.277 trunk)
Revision ID: a.starr.b@gmail.com-20111220181317-eg6ii0zpcf5pvc4l

Re-merge on trunk.

Show diffs side-by-side

added added

removed removed

debian/changelog

merge_changelog.py

merge_package.py

po/bzr-builddeb.pot

tests/blackbox/test_builddeb.py

tests/blackbox/test_dep3.py

tests/blackbox/test_get_tar.py

tests/blackbox/test_merge_upstream.py

tests/test_commit_message.py

tests/test_import_dsc.py

tests/test_merge_changelog.py

tests/test_merge_package.py

tests/test_revspec.py

tests/test_upstream.py

upstream/__init__.py

upstream/branch.py

upstream/pristinetar.py

Older »