]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/6.8'
authorHenri Sara <hesara@vaadin.com>
Thu, 22 Dec 2011 14:00:52 +0000 (16:00 +0200)
committerHenri Sara <hesara@vaadin.com>
Thu, 22 Dec 2011 14:00:52 +0000 (16:00 +0200)
commitc6cc203ec360f9efbfb116029ca855a28c7bfa63
tree8448edb2b703462edda6120ce888531cdba6710c
parent227941bc6248fd4fb70bba3255d3920c3737a1f8
parent02daee926e0bb40bcd8a321a2a27570da5c9c928
Merge remote branch 'origin/6.8'

Conflicts:
tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
WebContent/VAADIN/themes/chameleon/components/button/button.css
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/terminal/gwt/server/WebBrowser.java
src/com/vaadin/ui/Window.java
tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java