]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1449ab2 12b4977)
Merged changes from 6.3 to 6.4
authorHenri Sara <henri.sara@itmill.com>
Mon, 31 May 2010 11:14:51 +0000 (11:14 +0000)
committerHenri Sara <henri.sara@itmill.com>
Mon, 31 May 2010 11:14:51 +0000 (11:14 +0000)
svn changeset:13432/svn branch:6.4

1  2 
build/build.xml patch | diff1 | diff2 | blob | history
src/com/vaadin/ui/Window.java patch | diff1 | diff2 | blob | history

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