You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by db...@apache.org on 2013/03/13 22:11:36 UTC
[4/4] git commit: Merge branch 'trunk' into mrunit-1.0
Updated Branches:
refs/heads/mrunit-1.0 6d68bdcce -> d47e8dc28
Merge branch 'trunk' into mrunit-1.0
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/mrunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/mrunit/commit/d47e8dc2
Tree: http://git-wip-us.apache.org/repos/asf/mrunit/tree/d47e8dc2
Diff: http://git-wip-us.apache.org/repos/asf/mrunit/diff/d47e8dc2
Branch: refs/heads/mrunit-1.0
Commit: d47e8dc28ec5880ee8aee9dfc010276f6521717b
Parents: a802902 19ef2d3
Author: Dave Beech <da...@paraliatech.com>
Authored: Wed Mar 13 21:11:17 2013 +0000
Committer: Dave Beech <da...@paraliatech.com>
Committed: Wed Mar 13 21:11:17 2013 +0000
----------------------------------------------------------------------
pom.xml | 3 ++-
src/main/assembly/bin-assembly.xml | 2 ++
src/main/assembly/src-assembly.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mrunit/blob/d47e8dc2/pom.xml
----------------------------------------------------------------------