]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/6.8'
authorArtur Signell <artur@vaadin.com>
Tue, 27 Mar 2012 07:36:26 +0000 (10:36 +0300)
committerArtur Signell <artur@vaadin.com>
Tue, 27 Mar 2012 07:36:26 +0000 (10:36 +0300)
commitcf025b388dc07f50e8743fd6127cf2a9c5a1c628
treef6732f54dcdd47cfc302bf0ee966066fdc462787
parent45c0127529b574ff80f526a82ef2ca0c35c57b51
parent381c3eb5d4ebce92bceddd06e2a9ed81b40789c4
Merge remote-tracking branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java

Moved Table context menu tracking to VScrollTable as there is no "open"
listener for a context menu. Previous merge was broken.
src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
src/com/vaadin/terminal/gwt/client/ui/TableConnector.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java