]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/6.8'
authorJohannes Dahlström <johannesd@vaadin.com>
Fri, 2 Mar 2012 12:24:56 +0000 (14:24 +0200)
committerJohannes Dahlström <johannesd@vaadin.com>
Fri, 2 Mar 2012 12:24:56 +0000 (14:24 +0200)
commit7ae5f809f7421d3d78aa71cfae4103af79051c2e
treeb4923f1e7ba05beb3afe26bc660111bd17191ec4
parentc7ffbcb9cca8c299e9b7d300cc1e30213cb61d00
parentd80e178af577697f7af3aa899251367c50f4533c
Merge remote-tracking branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/ui/TabSheet.java
WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
WebContent/VAADIN/themes/chameleon/components/table/table.css
WebContent/VAADIN/themes/reindeer/table/table.css
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/ui/TabSheet.java
src/com/vaadin/ui/Table.java
tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java