]> source.dussan.org Git - vaadin-framework.git/commit
Merge commit '8b064'
authorJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 11:08:31 +0000 (14:08 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 11:08:31 +0000 (14:08 +0300)
commita8ce73677517dbef68c52c4469720b902e287796
treea6f82feff92426504dc2e26e11946bd1ee2e8cf0
parente962f331970863af3f12c386eb39ce9562672d2b
parent8b064167bbf42f1e0788e854bd7450a87fc480a2
Merge commit '8b064'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java