diff options
| author | Artur Signell <artur@vaadin.com> | 2014-10-16 11:28:12 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-10-31 07:34:00 +0000 |
| commit | 5a8f373e53f804b1e49d40bf74040fc69381b985 (patch) | |
| tree | 409732a8fec5008994d03768606c1a112deabe30 /WebContent | |
| parent | 54ed43adad5b853dfffdc48aebbc74087e34b735 (diff) | |
| download | vaadin-framework-5a8f373e53f804b1e49d40bf74040fc69381b985.tar.gz vaadin-framework-5a8f373e53f804b1e49d40bf74040fc69381b985.zip | |
Update GWT to 2.7.0.beta1vaadin1.
Update client-compiler-deps to 1.2.0.
Fix classpaths for devmodes.
Change-Id: I8452271594b4563bf476420ff7ab22985913e397
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/license.html | 12 | ||||
| -rw-r--r-- | WebContent/licenses/ow2-asm-license.txt | 31 |
2 files changed, 42 insertions, 1 deletions
diff --git a/WebContent/license.html b/WebContent/license.html index 0ce22da99c..48be15b98d 100644 --- a/WebContent/license.html +++ b/WebContent/license.html @@ -90,6 +90,16 @@ <td><a href="licenses/apache-license-version-2-0.txt">Apache License, Version 2.0</a></td> </tr> + <tr> + <td>Closure Stylesheets</td> + <td><a href="licenses/apache-license-version-2-0.txt">Apache License, Version 2.0</a></td> + </tr> + + <tr> + <td>ASM</td> + <td><a href="licenses/ow2-asm-license.txt">ASM Project License</a></td> + </tr> + <!-- In vaadin-shared-deps --> <tr> <td>Guava</td> @@ -99,7 +109,7 @@ <!-- In vaadin-shared-deps --> <tr> <td>JSON</td> - <td><a href="licenses/the-json-license.txt">The JSON License</a></td> + <td><a href="licenses/apache-license-version-2-0.txt">Apache License, Version 2.0</a></td> </tr> <!-- Used by vaadin-server --> diff --git a/WebContent/licenses/ow2-asm-license.txt b/WebContent/licenses/ow2-asm-license.txt new file mode 100644 index 0000000000..b8ed869a5c --- /dev/null +++ b/WebContent/licenses/ow2-asm-license.txt @@ -0,0 +1,31 @@ +http://asm.ow2.org/license.html + +Copyright (c) 2000-2011 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file |