]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7eb0276 e7f3159)
Merge commit 'e7f31'
authorJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 12:31:37 +0000 (15:31 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 12:31:37 +0000 (15:31 +0300)
Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java

1  2 
src/com/vaadin/terminal/gwt/server/WebBrowser.java patch | diff1 | diff2 | blob | history

Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework