]> source.dussan.org Git - vaadin-framework.git/commit
projects / vaadin-framework.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f9368d8 bb486ff)
Merge commit 'bb486'
authorJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 10:51:23 +0000 (13:51 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 10:51:23 +0000 (13:51 +0300)
commit7084c70d713833d983e348ea8d31adce51821f91
tree49a5b33698b05bb07a1e552bd1022c5b864a3899tree | snapshot
parentf9368d8038619912b90f3f1e04929fb432208ad4commit | diff
parentbb486ff26ad6f43197aba42d5af53508bf2c5235commit | diff
Merge commit 'bb486'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java
src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java diff1 | | blob | history
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework