diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-29 12:22:31 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-29 12:22:31 +0300 |
| commit | 63595217a224b9fbc6de4b8bdc2e6b317e0558d5 (patch) | |
| tree | 9d7bcafc23ef5f4c6aad8bca6555fc04396aa1c6 /server/src/com/vaadin/annotations | |
| parent | e18177bac62e8367829dfc5ec3083a09973e621e (diff) | |
| download | vaadin-framework-63595217a224b9fbc6de4b8bdc2e6b317e0558d5.tar.gz vaadin-framework-63595217a224b9fbc6de4b8bdc2e6b317e0558d5.zip | |
Merged com.vaadin.terminal.gwt.server into com.vaadin.server (#9431)
Diffstat (limited to 'server/src/com/vaadin/annotations')
| -rw-r--r-- | server/src/com/vaadin/annotations/JavaScript.java | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/annotations/StyleSheet.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/annotations/JavaScript.java b/server/src/com/vaadin/annotations/JavaScript.java index 7943fe1055..1a2fdf7583 100644 --- a/server/src/com/vaadin/annotations/JavaScript.java +++ b/server/src/com/vaadin/annotations/JavaScript.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.terminal.gwt.server.ClientConnector; +import com.vaadin.server.ClientConnector; /** * If this annotation is present on a {@link ClientConnector} class, the diff --git a/server/src/com/vaadin/annotations/StyleSheet.java b/server/src/com/vaadin/annotations/StyleSheet.java index 7833544ab5..e1a9efd696 100644 --- a/server/src/com/vaadin/annotations/StyleSheet.java +++ b/server/src/com/vaadin/annotations/StyleSheet.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.terminal.gwt.server.ClientConnector; +import com.vaadin.server.ClientConnector; /** * If this annotation is present on a {@link ClientConnector} class, the |