]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33f6d6e 2eff8c0)
Merge branch 'master' into windowing
authorLeif Åstrand <leif@vaadin.com>
Tue, 8 Nov 2011 15:36:53 +0000 (17:36 +0200)
committerLeif Åstrand <leif@vaadin.com>
Tue, 8 Nov 2011 15:36:53 +0000 (17:36 +0200)
1  2 
build/build.xml patch | diff1 | diff2 | blob | history

diff --cc build/build.xml
Simple merge
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework