]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61c04df 220101a)
Merge branch 'root-cleanup' of ssh://dev.vaadin.com/vaadin into root-cleanup
authorJohannes Dahlström <johannesd@vaadin.com>
Wed, 22 Aug 2012 12:16:37 +0000 (15:16 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Wed, 22 Aug 2012 12:16:37 +0000 (15:16 +0300)
Conflicts:
client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java


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