summaryrefslogtreecommitdiffstats
path: root/client-compiled
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2014-05-16 11:41:42 +0300
committerHenri Sara <hesara@vaadin.com>2014-05-16 13:03:09 +0300
commitb4180f2388a6ec97c422097f16da617114aba590 (patch)
tree86d73cb261f89d7360d5810e2986a6e78e066374 /client-compiled
parente65231e6028892bd6847777c5bad982b73278b14 (diff)
parent0f74fdff68cef4eac27913bb4fd0943ff39ca604 (diff)
downloadvaadin-framework-7.3.0.alpha2.tar.gz
vaadin-framework-7.3.0.alpha2.zip
Merge master into valo7.3.0.alpha2
This change does not include all release notes updates from master. Change-Id: I209dc06d03d4541ac33746d1161630f0ca8ae5d9
Diffstat (limited to 'client-compiled')
-rw-r--r--client-compiled/build.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 448c9799cd..78757f5ceb 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -85,7 +85,8 @@
<arg value="-localWorkers" />
<arg value="${localWorkers}" />
<arg value="-strict" />
- <arg value="-XenableClosureCompiler" />
+ <!-- Disabled for now as it breaks code, e.g. ButtonWithShortcutNotRendered -->
+ <!-- <arg value="-XenableClosureCompiler" />-->
<arg line="${extraParams}" />
<arg value="${module}" />