]> source.dussan.org Git - vaadin-framework.git/commit
Merge commit 'f560e'
authorJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 10:57:38 +0000 (13:57 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 10:57:38 +0000 (13:57 +0300)
commit8d77cb72dc89d65e199831b25e870872e703ebcf
treec7b40a68ba019300af1d90fb8521073426e26098
parentd68a52ec88cb7faf3c5f15173b6fa5ec453ce7a8
parentf560e8e20bdcc8035d17c494d31d961d440a60c2
Merge commit 'f560e'

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