← Back to branch summary

~mars/tarmac/throwaway-merge-source

~mars/tarmac/throwaway-merge-source

Viewing all changes in revision 125.1.15.

Committer: Paul Hummer
Date: 2009-07-11 04:18:18 UTC
mfrom: (131 tarmac)
mto: This revision was merged to the branch mainline in revision 132.
Revision ID: paul@eventuallyanyway.com-20090711041818-jirjz6ert780jcx9

Merge from trunk, resolve conflicts

Show diffs side-by-side

added added

removed removed

bzrplugin/__init__.py

tarmac-authenticate

tarmac/__init__.py

tarmac/branch.py

tarmac/config.py

tarmac/exceptions.py

tarmac/hooks.py

tarmac/plugin.py

tarmac/plugins/__init__.py

tarmac/plugins/ciavc.py

tarmac/plugins/commitmessage.py

tarmac/plugins/runtest.py

tarmac/tests/__init__.py

tarmac/tests/mock.py

tarmac/tests/test_branch.py

tarmac/tests/test_scripts.py

tarmac/utils.py

templates/index.html

Older »