]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/databinding'
authorLeif Åstrand <leif@vaadin.com>
Thu, 8 Dec 2011 14:57:07 +0000 (16:57 +0200)
committerLeif Åstrand <leif@vaadin.com>
Thu, 8 Dec 2011 14:57:07 +0000 (16:57 +0200)
commit93155d828384a9853a2f830c9eb717d9a645637e
treedd4ba4f7700b564390edcaf034476b7d02f289f5
parent077233afb619d5246421290286325b60c627fd1a
parent5ac93af2895e0bd2be52dcc794d403a0bfb0c78c
Merge remote branch 'origin/databinding'

Conflicts:
src/com/vaadin/Application.java
src/com/vaadin/ui/AbstractField.java
tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
tests/testbench/com/vaadin/tests/tickets/Ticket1673.java
36 files changed:
src/com/vaadin/Application.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/ui/AbstractComponent.java
tests/testbench/com/vaadin/tests/CustomLayoutDemo.java
tests/testbench/com/vaadin/tests/TestForStyledUpload.java
tests/testbench/com/vaadin/tests/UpgradingSample.java
tests/testbench/com/vaadin/tests/VaadinClasses.java
tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
tests/testbench/com/vaadin/tests/dd/DDTest2.java
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
tests/testbench/com/vaadin/tests/tickets/Ticket1245.java
tests/testbench/com/vaadin/tests/tickets/Ticket1397.java
tests/testbench/com/vaadin/tests/tickets/Ticket1673.java
tests/testbench/com/vaadin/tests/tickets/Ticket1804.java
tests/testbench/com/vaadin/tests/tickets/Ticket1819.java
tests/testbench/com/vaadin/tests/tickets/Ticket1878.java
tests/testbench/com/vaadin/tests/tickets/Ticket1900.java
tests/testbench/com/vaadin/tests/tickets/Ticket1919.java
tests/testbench/com/vaadin/tests/tickets/Ticket1921.java
tests/testbench/com/vaadin/tests/tickets/Ticket20.java
tests/testbench/com/vaadin/tests/tickets/Ticket2053.java
tests/testbench/com/vaadin/tests/tickets/Ticket2090.java
tests/testbench/com/vaadin/tests/tickets/Ticket2107.java
tests/testbench/com/vaadin/tests/tickets/Ticket2119.java
tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
tests/testbench/com/vaadin/tests/tickets/Ticket2179.java
tests/testbench/com/vaadin/tests/tickets/Ticket2204.java
tests/testbench/com/vaadin/tests/tickets/Ticket2998.java
tests/testbench/com/vaadin/tests/tickets/Ticket677.java
tests/testbench/com/vaadin/tests/tickets/Ticket736.java
tests/testbench/com/vaadin/tests/tickets/Ticket846.java