summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite (renamed from branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite)0
1 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite
index 88b8212c5e..88b8212c5e 100644
--- a/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/vtest/assembly/composite/src/main/resources/composite.composite