aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-07-13 15:46:31 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2015-07-13 15:46:31 +0300
commitae5793ae460cab22612c134cbec4b8ae6ed4175b (patch)
treee24c1924cc4882a273707661d16d9a67c875aa31 /widgets
parent40dcbc3cfaa438c9b879720c9012331dd85ca694 (diff)
parent96e10ed8be9ec1e694001098584361e43eb35af2 (diff)
downloadvaadin-framework-ae5793ae460cab22612c134cbec4b8ae6ed4175b.tar.gz
vaadin-framework-ae5793ae460cab22612c134cbec4b8ae6ed4175b.zip
Merge remote-tracking branch 'origin/master' into grid-unbuffered-editor
Change-Id: Id630861d5089b0deabbccffe66d971252c44f46b
Diffstat (limited to 'widgets')
-rw-r--r--widgets/build.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/widgets/build.xml b/widgets/build.xml
index 63317fb5ad..a437fd1940 100644
--- a/widgets/build.xml
+++ b/widgets/build.xml
@@ -45,6 +45,7 @@
<fileset dir="${result.deps}">
<include name="com/vaadin/*.gwt.xml" />
<include name="com/vaadin/client/BrowserInfo.java" />
+ <include name="com/vaadin/client/ComputedStyle.java" />
<include name="com/vaadin/client/DeferredWorker.java" />
<include name="com/vaadin/client/Profiler.java" />
<include name="com/vaadin/client/StyleConstants.java" />