summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-01-14 07:35:29 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-01-14 07:35:29 +0000
commit75bc85590e5bc05aff6d7234bf3296d41b324b94 (patch)
tree09afebe1288e5029615dc0d066375bae801af229 /java
parent0b0c4db98203e2d3dc2f656641c74aa9a4ae82fc (diff)
Merge branch 'tuscany-2663'
Conflicts: modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@734356 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions