]> source.dussan.org Git - vaadin-framework.git/commit
Merge commit 'e085e'
authorJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 11:43:48 +0000 (14:43 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 11:43:48 +0000 (14:43 +0300)
commit7eb0276de46ec74416439f021fa47a1c24bd67d5
tree2a9d88fdc049c5d43e2ba24f47795bc5fef3cdbc
parent7cfbbea6aef34cc753b2e9a7840d647782af44a7
parente085efa41793fc68d455fa5d718bbfc1309296b9
Merge commit 'e085e'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java
src/com/vaadin/ui/Window.java
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java