diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-16 10:29:28 +0300 |
|---|---|---|
| committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-06-16 10:30:24 +0300 |
| commit | 7a92b54724133328998e7c7178b5c298bc88fcd0 (patch) | |
| tree | 54f340a8ee21e0407fe790e1113881ed947de3cc /build.properties | |
| parent | 7a4d0003e9bb6fd920bb879eaff1c24cd6f1f3e7 (diff) | |
| parent | ccdc34051d6c74292ce981f66c31c160620a04da (diff) | |
| download | vaadin-framework-7a92b54724133328998e7c7178b5c298bc88fcd0.tar.gz vaadin-framework-7a92b54724133328998e7c7178b5c298bc88fcd0.zip | |
Merge branch 'master' into valo
Conflicts:
build.properties
Change-Id: I2477f2b420506d1b41d29d9bb1e361d66bedb68d
Diffstat (limited to 'build.properties')
| -rw-r--r-- | build.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build.properties b/build.properties index b524afd139..0fc074ce69 100644 --- a/build.properties +++ b/build.properties @@ -6,4 +6,5 @@ vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.6 +gwt.version=2.6.0.vaadin2 commons-io.version=2.4 |