]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Tue, 14 Feb 2012 10:48:07 +0000 (12:48 +0200)
committerLeif Åstrand <leif@vaadin.com>
Tue, 14 Feb 2012 10:48:07 +0000 (12:48 +0200)
commit0628eea037ebb9f47ad77f37c59145082fc2e74c
treeb9ed441c79ba1e4acad13aa70ffdb4379cac5ea9
parentecd80181d160b58a281eb92fabaa2a10ea0adac2
parent36f749b4f83086a5306726ad607c9bb3a0fa7526
Merge remote branch 'origin/6.8'

Conflicts:
WebContent/release-notes.html
tests/test.xml
tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
src/com/vaadin/terminal/gwt/client/BrowserInfo.java
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
tests/test.xml
tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java