Author: nash
Date: Sat May 15 15:06:43 2010
New Revision: 944657
URL: http://svn.apache.org/viewvc?rev=944657&view=rev
Log:
Merge revision r936180 from trunk
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml?rev=944657&r1=944656&r2=944657&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
Sat May 15 15:06:43 2010
@@ -47,7 +47,7 @@
<!-- Add the text files to the top-level directroy -->
<fileSet>
<directory>src/main/release</directory>
- <outputDirectory>travelsample</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>BUILDING</include>
<include>CHANGES</include>
