]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 989e9d4 0441315)
Merge "Use class hierachy for resolving @Connect conflicts (#9826)"
authorJohn Ahlroos <john@vaadin.com>
Thu, 11 Oct 2012 13:02:43 +0000 (13:02 +0000)
committerVaadin Code Review <review@vaadin.com>
Thu, 11 Oct 2012 13:02:43 +0000 (13:02 +0000)

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