Author: antelder
Date: Fri Jul 22 08:49:42 2011
New Revision: 1149502
URL: http://svn.apache.org/viewvc?rev=1149502&view=rev
Log:
Merge r1149501 from trunk to branch to include changes and release notes
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml?rev=1149502&r1=1149501&r2=1149502&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
(original)
+++
tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
Fri Jul 22 08:49:42 2011
@@ -50,6 +50,15 @@
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>CHANGES</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+
</fileSets>
</assembly>
