diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-04-16 14:19:11 +0300 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-04-16 14:19:11 +0300 |
| commit | 202514e6c03877b40bbb17fbb74cf4d68eb21503 (patch) | |
| tree | 2528d17a52bb82805decdcd66ec6a0889812f508 /build.properties | |
| parent | 6c022639adfcf2c0b8db52062b32a0479b07ad7d (diff) | |
| parent | 591996b94e7b7c432708611819087b8e03d21ea5 (diff) | |
| download | vaadin-framework-202514e6c03877b40bbb17fbb74cf4d68eb21503.tar.gz vaadin-framework-202514e6c03877b40bbb17fbb74cf4d68eb21503.zip | |
Merge commit '591996b' into 7.2
Conflicts:
build.properties
Change-Id: Ie3cf9bd0af8aba7debf4626d2db77afea37e7cb3
Diffstat (limited to 'build.properties')
| -rw-r--r-- | build.properties | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build.properties b/build.properties index 21cb173561..074d723897 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ javadoc.doctitle=<h1>Vaadin</h1> -javadoc.bottom=<i>Copyright © 2000-2011 Vaadin Ltd. All Rights Reserved.</i> +javadoc.bottom=<i>Copyright © 2000-2014 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.0 -commons-io.version=2.4
\ No newline at end of file +commons-io.version=2.4 |