]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Fri, 6 Jan 2012 10:39:16 +0000 (12:39 +0200)
committerLeif Åstrand <leif@vaadin.com>
Fri, 6 Jan 2012 10:39:16 +0000 (12:39 +0200)
commite887c06e07aa3f3ec1765196af51bd82a5fb4f46
tree4f7b6f1f92cadb51cb7ff362b6162be2d3ebc0e8
parent496e358dc049cf7be818340332a53ff8758df939
parentdd786ffd3554828e91d4398bc9a3ce6e498f74b2
Merge remote branch 'origin/6.8'

Conflicts:
src/com/vaadin/data/validator/AbstractValidator.java
tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/VTextField.java
src/com/vaadin/ui/Window.java
tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java