summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2012-08-20 16:07:47 +0300
committerJohn Ahlroos <john@vaadin.com>2012-08-20 16:07:47 +0300
commit0dfdb151913a13e929a65c4dd8b5987c9edd06d5 (patch)
treee5c48a390aa362a5e88df308570adfbef25acca1 /build
parentc9689846a8ba1254fb51c164cee6c3c157740eac (diff)
parentd2110e364b0aa87fd25f1f48d865dd455c5d0d7a (diff)
downloadvaadin-framework-0dfdb151913a13e929a65c4dd8b5987c9edd06d5.tar.gz
vaadin-framework-0dfdb151913a13e929a65c4dd8b5987c9edd06d5.zip
Merged 6.8 branch
Diffstat (limited to 'build')
-rw-r--r--build/bin/package-diff.py2
-rw-r--r--build/build.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/build/bin/package-diff.py b/build/bin/package-diff.py
index a9f29e40a9..27f1ade771 100644
--- a/build/bin/package-diff.py
+++ b/build/bin/package-diff.py
@@ -7,7 +7,7 @@ from sets import Set
# Configuration
################################################################################
downloadsite = "http://vaadin.com/download"
-latestfile = "/release/6.7/LATEST"
+latestfile = "/release/6.8/LATEST"
JAPIZE = "japize"
JAPICOMPAT = "japicompat"
diff --git a/build/build.xml b/build/build.xml
index ba9b93a2ab..2988218c4d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -531,6 +531,7 @@
<include name="VAADIN/themes/**/*" />
<include name="VAADIN/vaadinBootstrap.js" />
<include name="META-INF/**/*" />
+ <include name="statictestfiles/**" />
</fileset>
</copy>