summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-07-22 08:49:42 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-07-22 08:49:42 +0000
commita1b887658558a9d1452585f0e4e41e34565fff72 (patch)
tree2596f9e57d733ed7606503cdb02493b2021ec1da
parent3e6d5d20286fb72b41c3414627366579346911e3 (diff)
Merge r1149501 from trunk to branch to include changes and release notes
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1149502 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml b/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
index 7e7afc66a4..8476f9575b 100644
--- a/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
+++ b/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
@@ -50,6 +50,15 @@
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>CHANGES</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+
</fileSets>
</assembly>