diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-03 12:58:56 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-03 15:09:11 +0300 |
| commit | ad452a36795b764aeea2b00e3ceed2bae75d7949 (patch) | |
| tree | 9b522f8b93464520430d839ab1608fa372efe23a /checkstyle/header | |
| parent | e65231e6028892bd6847777c5bad982b73278b14 (diff) | |
| parent | 44eadeaa160152616152cd33f8181d7ab1fa3359 (diff) | |
| download | vaadin-framework-ad452a36795b764aeea2b00e3ceed2bae75d7949.tar.gz vaadin-framework-ad452a36795b764aeea2b00e3ceed2bae75d7949.zip | |
Merge branch 'master' into valo
Conflicts:
WebContent/release-notes.html
build.properties
client/src/com/vaadin/client/ApplicationConfiguration.java
Change-Id: I36f075a03350e45c8666832142d7368891af3e59
Diffstat (limited to 'checkstyle/header')
| -rw-r--r-- | checkstyle/header | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/checkstyle/header b/checkstyle/header index 511f77e5ba..a1063268ac 100644 --- a/checkstyle/header +++ b/checkstyle/header @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 Vaadin Ltd. + * Copyright 2000-2014 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 @@ -12,4 +12,4 @@ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations under * the License. - */
\ No newline at end of file + */ |