]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/6.8'
authorArtur Signell <artur@vaadin.com>
Fri, 3 Feb 2012 20:26:47 +0000 (22:26 +0200)
committerArtur Signell <artur@vaadin.com>
Fri, 3 Feb 2012 20:26:47 +0000 (22:26 +0200)
commit04dabc72d1cce709c848b52d0f83f331104ebe92
tree1a59a751c51f3f102c59d14d790d66e4379dc23b
parent4ede774d6c121f51537078ae9890bbf44f835e12
parent9d18b93a069503a9b9b90bd78836fde687af051d
Merge remote-tracking branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
tests/test.xml
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
tests/integration_tests.xml
tests/test.xml