diff options
| author | John Ahlroos <john@vaadin.com> | 2012-08-28 09:41:55 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-08-28 09:41:55 +0300 |
| commit | 435a2e735251464529f8329b0563c26d5b4cc6a9 (patch) | |
| tree | 8bde89594f6b258f087a8518265418a02800cea2 /server/src/com/vaadin/annotations/Theme.java | |
| parent | 7b9e1566d6e36c10aef3566b20267449586a81cb (diff) | |
| parent | c6d43cc88fb0ef4853e07be54fc76a6aa1dc9e23 (diff) | |
| download | vaadin-framework-435a2e735251464529f8329b0563c26d5b4cc6a9.tar.gz vaadin-framework-435a2e735251464529f8329b0563c26d5b4cc6a9.zip | |
Merge branch 'master' into layoutgraph
Conflicts:
tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
Diffstat (limited to 'server/src/com/vaadin/annotations/Theme.java')
| -rw-r--r-- | server/src/com/vaadin/annotations/Theme.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/annotations/Theme.java b/server/src/com/vaadin/annotations/Theme.java index e2610d2b3f..052bc245fd 100644 --- a/server/src/com/vaadin/annotations/Theme.java +++ b/server/src/com/vaadin/annotations/Theme.java @@ -21,10 +21,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** - * Defines a specific theme for a {@link Root}. + * Defines a specific theme for a {@link UI}. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) |