diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-20 13:26:57 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-20 14:53:22 +0300 |
| commit | 1ac972f2bb7d92604a89abf5e08e4343726fbd01 (patch) | |
| tree | 8f213bb97eb2f2abd0d02c0eec1e16871d5bb823 /build.properties | |
| parent | 335eb7937d29c4b540b9bd2e02651e11ff46a6ba (diff) | |
| parent | 13ddd2b03c99b563b131c115982ac09453ca749f (diff) | |
| download | vaadin-framework-1ac972f2bb7d92604a89abf5e08e4343726fbd01.tar.gz vaadin-framework-1ac972f2bb7d92604a89abf5e08e4343726fbd01.zip | |
Merge branch 'master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: Icccb2e30199f99a7b0b00f05b1a12d5f7297402f
Diffstat (limited to 'build.properties')
| -rw-r--r-- | build.properties | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build.properties b/build.properties index 21cb173561..043407b85d 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 +vaadin.sass.version=0.9.2 +commons-io.version=2.4 |