summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2011-09-30 12:10:45 +0000
committerHenri Sara <henri.sara@itmill.com>2011-09-30 12:10:45 +0000
commit4794b6bf53db9b57b74fdb6e200b260ee20373b3 (patch)
treee004b3a694f6f083fe1fba26db3e07e166c0e6bd /build
parentead7a79bc2cfdd9887f01937e0ca82db71c6ea69 (diff)
downloadvaadin-framework-4794b6bf53db9b57b74fdb6e200b260ee20373b3.tar.gz
vaadin-framework-4794b6bf53db9b57b74fdb6e200b260ee20373b3.zip
Merged changes from 6.6 (#7692)
svn changeset:21470/svn branch:6.7
Diffstat (limited to 'build')
-rw-r--r--build/build.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/build/build.xml b/build/build.xml
index 0a59d1f3b0..dd7635f0a5 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -195,12 +195,12 @@
<war warfile="${result-path}/${test-war-filename}">
<fileset dir="${output-dir}/WebContent">
<!-- Already in JAR -->
- <exclude name="themes/base/**/*" />
- <exclude name="themes/chameleon/**/*" />
- <exclude name="themes/liferay/**/*" />
- <exclude name="themes/runo/**/*" />
- <exclude name="themes/reindeer/**/*" />
- <exclude name="widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
+ <exclude name="VAADIN/themes/base/**/*" />
+ <exclude name="VAADIN/themes/chameleon/**/*" />
+ <exclude name="VAADIN/themes/liferay/**/*" />
+ <exclude name="VAADIN/themes/reindeer/**/*" />
+ <exclude name="VAADIN/themes/runo/**/*" />
+ <exclude name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
<!-- Not needed for testing -->
<exclude name="docs/**/*" />