]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Tue, 10 Apr 2012 09:56:39 +0000 (12:56 +0300)
committerLeif Åstrand <leif@vaadin.com>
Tue, 10 Apr 2012 09:56:39 +0000 (12:56 +0300)
commita8941d2e09c6b0f5e904b60378f9b469d2d9fd9e
tree84f3021591df5fec93f11bcf1ed140294555f81c
parent105d563f6622256d00d580dc52cc302e7c810e56
parent18dd267cfe3757adee20aaae556b64746c677683
Merge remote branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/terminal/gwt/client/ui/VTree.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/ui/AbstractField.java
src/com/vaadin/terminal/gwt/client/ui/TabsheetConnector.java
src/com/vaadin/terminal/gwt/client/ui/TreeConnector.java
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/terminal/gwt/client/ui/VTree.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/ui/AbstractField.java
src/com/vaadin/ui/TabSheet.java
tests/integration_tests.xml
tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java