]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f29e9cf 7bd2ebe)
Merge branch 'master' into hierarchypaint
authorHenri Sara <hesara@vaadin.com>
Fri, 16 Mar 2012 11:47:54 +0000 (13:47 +0200)
committerHenri Sara <hesara@vaadin.com>
Fri, 16 Mar 2012 11:47:54 +0000 (13:47 +0200)

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