diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-06-13 22:38:42 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-06-13 22:38:42 +0300 |
| commit | faa693e33b24cb34e7811d94d5efe5605117af7f (patch) | |
| tree | b0b54d989d5ec83416b77f01c9e63398786dd8a5 /theme-compiler | |
| parent | be274254b5e6f4dd9386d4a3dd994ec834147e8b (diff) | |
| parent | 54ffbdb70746743f4754416911f726f8d556b3ed (diff) | |
| download | vaadin-framework-faa693e33b24cb34e7811d94d5efe5605117af7f.tar.gz vaadin-framework-faa693e33b24cb34e7811d94d5efe5605117af7f.zip | |
Merge changes from origin/7.1
da0a112 Merge changes from origin/7.0
6ba8938 Restore legacyPropertyToString value parsing logic (#11970)
d5c0ffa Fix NPE when converting null values (#11895)
2aa3096 Avoid string casing problems (#11970)
0f107f3 Update widgetset template (#12053)
eb64fda Add support for rem units (#11279)
5f66766 Using StringTokenizer instead of String.split() in AbstractComponent (#8759)
15b217d Handle push disconnections and reconnections more reliably (#11831, #11922)
47addab Adding isIOs and isAndroid to the WebBrowser wrapper around VBrowserDetails (#11168)
0aa5907 Do not write 404 as a response to all action/event requests (#12056)
55ebe13 Detach and attach when adding or removing the caption wrapper (#11708)
7830af2 Fix GridLayout resize after removing caption (#12011)
53e3a25 DebugWindow resize/move improved, fixes #11937 (also implements shift-resize and alt-move, improves bounds-check)
f2b2ce9 Updated to Smartsprites 0.2.10 (#12069)
29c9b60 SimpleTree styling changed for #12058
da8382d DebugWindow now remembers open tab/section, InfoSection fixed to support being opened at once, for #12058
4f5bcef Info tab is now tab 1, hierarchy tab 2
a089743 Consistently recover from disconnections in IE (#12073)
59103a9 Always notify parent of enable state changes (#12062)
997e9a9 Fixed test issue apparently caused by three levels of classes
54ffbdb Add missing license header
Change-Id: Ifba747964fa0d8265bb468ca555b84dadec9fa0a
Diffstat (limited to 'theme-compiler')
| -rw-r--r-- | theme-compiler/ivy.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml index 97ecfa4416..6a7528ceeb 100644 --- a/theme-compiler/ivy.xml +++ b/theme-compiler/ivy.xml @@ -45,7 +45,7 @@ <!-- Internally used, for now --> <dependency org="com.carrotsearch" name="smartsprites" - rev="0.2.10-vaadin" /> + rev="0.2.10" /> <!-- Use the same commons-io as the rest of the project --> <override org="commons-io" module="commons-io" rev="2.2" /> </dependencies> |