]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into databinding
authorHenri Sara <hesara@vaadin.com>
Thu, 8 Dec 2011 08:23:41 +0000 (10:23 +0200)
committerHenri Sara <hesara@vaadin.com>
Thu, 8 Dec 2011 08:23:41 +0000 (10:23 +0200)
commit9cddb80d22ac9074032bde2880623ddfbdc60097
tree2c8fa859f3a49e4706cb9f4e41f8dbb6b743f282
parentc7d2e68579cddf872fe794e53cdbdc5898ac9277
parenta56ef07855844334323cbd266b3268df505c0335
Merge branch 'master' into databinding

Conflicts:
src/com/vaadin/data/util/PropertyFormatter.java
src/com/vaadin/data/validator/CompositeValidator.java
tests/testbench/com/vaadin/tests/tickets/Ticket20.java
src/com/vaadin/data/Validator.java
src/com/vaadin/data/util/PropertyFormatter.java
src/com/vaadin/data/validator/CompositeValidator.java
src/com/vaadin/ui/AbstractComponent.java
src/com/vaadin/ui/Form.java
src/com/vaadin/ui/Table.java
tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java
tests/testbench/com/vaadin/tests/tickets/Ticket20.java