diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 14:05:36 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 14:05:36 +0300 |
| commit | 75e13a8d46289675925ff40dc71400298791d4c4 (patch) | |
| tree | 4d40546de2ed89e4e3e2c850e28fa184c834398c /src/com | |
| parent | 6e3258a8c2f260ccb24943d26336fcc45f97be8b (diff) | |
| parent | 321b403c95ce067db25b67b91c531a5e082c38eb (diff) | |
| download | vaadin-framework-75e13a8d46289675925ff40dc71400298791d4c4.tar.gz vaadin-framework-75e13a8d46289675925ff40dc71400298791d4c4.zip | |
Merge commit '321b4'
Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java b/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java index 0dc360813e..5f08f92cf0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java +++ b/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java @@ -27,6 +27,7 @@ import com.vaadin.terminal.gwt.client.Focusable; import com.vaadin.terminal.gwt.client.VConsole; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; +import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate; import com.vaadin.terminal.gwt.client.ui.VLazyExecutor; import com.vaadin.terminal.gwt.client.ui.textfield.VTextField; |