]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35b35a8 06bbbce)
Merge commit '06bbbce73348bded241c0fb856c6bacb39793e89'
authorArtur Signell <artur@vaadin.com>
Fri, 23 Mar 2012 07:01:11 +0000 (09:01 +0200)
committerArtur Signell <artur@vaadin.com>
Fri, 23 Mar 2012 07:01:11 +0000 (09:01 +0200)
Did not merge any changes as debug id is handled differently in Vaadin 7

Conflicts:
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/ComponentLocator.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java


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