source.dussan.org Git - vaadin-framework.git/commit

]> source.dussan.org Git - vaadin-framework.git/commit

Merge remote branch 'origin/master' into windowing

Conflicts:
tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java

src/com/vaadin/terminal/gwt/client/ui/VView.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java	\|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java	\|	diff2 \|	blob \| history

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

src/com/vaadin/terminal/gwt/client/ui/VView.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java	\|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java	diff1 \|	diff2 \|	blob \| history
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java	\|	diff2 \|	blob \| history