diff options
| author | Build Agent <build@vaadin.com> | 2014-03-28 12:43:37 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-03-28 12:43:37 +0200 |
| commit | 9e98c0cb230a26b2f73cb612183c34f2e779645b (patch) | |
| tree | 702dc60064a669a77436c6a67102c658a5c7e6cb /uitest/src/com/vaadin/tests/components/ui | |
| parent | 8bf852a4fa84169eae44d96da083224d0d72b6c1 (diff) | |
| parent | 43b8ca588189e3fddf69020e46ada4c3ad170e9f (diff) | |
| download | vaadin-framework-9e98c0cb230a26b2f73cb612183c34f2e779645b.tar.gz vaadin-framework-9e98c0cb230a26b2f73cb612183c34f2e779645b.zip | |
Merge changes from origin/7.1
4f7fc2d Fix invalid copyright header
43b8ca5 Remove unnecessary Webkit scrollbar test
Change-Id: I6153a89f689818fa9f612d4b22303f7d4030fa6d
Diffstat (limited to 'uitest/src/com/vaadin/tests/components/ui')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/ui/UIInitTest.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java index 8aa2032935..dc88865621 100644 --- a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java +++ b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java @@ -1,5 +1,17 @@ /* -@ITMillApache2LicenseForJavaFiles@ + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. */ package com.vaadin.tests.components.ui; |