diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 14:26:55 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 14:26:55 +0300 |
| commit | 7cfbbea6aef34cc753b2e9a7840d647782af44a7 (patch) | |
| tree | 7be16177c9a38877a8fdf54195900519728f6427 /WebContent/VAADIN | |
| parent | 7753988bf59ee37898f149f3f23060af9cf59be4 (diff) | |
| parent | bec62403a7b56f093f5ee9829fea20ba3dee4628 (diff) | |
| download | vaadin-framework-7cfbbea6aef34cc753b2e9a7840d647782af44a7.tar.gz vaadin-framework-7cfbbea6aef34cc753b2e9a7840d647782af44a7.zip | |
Merge commit 'bec62'
Conflicts:
WebContent/VAADIN/themes/base/common/common.css
src/com/vaadin/terminal/gwt/client/ui/button/VButton.java
src/com/vaadin/ui/Button.java
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index ccdd5190fc..b3bf6084be 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -247,5 +247,4 @@ div.v-app-loading { .v-scrollable { overflow: auto; - -webkit-overflow-scrolling: touch; } |