]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Tue, 31 Jul 2012 09:00:44 +0000 (12:00 +0300)
committerLeif Åstrand <leif@vaadin.com>
Tue, 31 Jul 2012 09:00:44 +0000 (12:00 +0300)
commite6ba86347ce0aea0b2dd7aa064586ce4fe7f2096
tree5d07d002edd4984536ade795c8c42451651d6f5c
parent569a82a7bfc4958a9ac164e16caecc3fb47fdbc7
parent64c7bbb569d5194eb9c5c083726a8c96053368e8
Merge remote-tracking branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java
tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
src/com/vaadin/ui/AbstractSelect.java
src/com/vaadin/ui/Table.java
tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java