]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Wed, 18 Apr 2012 11:09:56 +0000 (14:09 +0300)
committerLeif Åstrand <leif@vaadin.com>
Wed, 18 Apr 2012 11:09:56 +0000 (14:09 +0300)
commit290f6b3a2b6b3eeadf3c9904fbaae0fa2f016595
treee219c7615fa7aa14d89f274896a4eafb1f283cbb
parentcf06923748ce75dc8113e66a40bb69297def7072
parentc3e10ebbbc48d124a88d6e92e16faccdebe43223
Merge remote branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
src/com/vaadin/ui/TabSheet.java
src/com/vaadin/ui/Table.java
tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java