]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into layoutgraph
authorJohn Ahlroos <john@vaadin.com>
Fri, 31 Aug 2012 07:10:03 +0000 (10:10 +0300)
committerJohn Ahlroos <john@vaadin.com>
Fri, 31 Aug 2012 07:10:03 +0000 (10:10 +0300)
commit340cd7899812b444941584d383d930fe8155159b
tree5989b22f0db52cd578aad087afc9f9fe4d63fb9d
parent8b546f207714a663d4e2996f514cdc077cc9dafc
parent7b25b3886ea95bc6495506fbe9472e45fcbde684
Merge branch 'master' into layoutgraph

Conflicts:
client/src/com/vaadin/client/ComponentLocator.java
client/src/com/vaadin/client/ui/AbstractComponentConnector.java
23 files changed:
client/src/com/vaadin/client/ComponentLocator.java
client/src/com/vaadin/client/ComputedStyle.java
client/src/com/vaadin/client/LayoutManager.java
client/src/com/vaadin/client/ServerConnector.java
client/src/com/vaadin/client/ui/AbstractComponentConnector.java
client/src/com/vaadin/client/ui/AbstractConnector.java
client/src/com/vaadin/client/ui/orderedlayout/AbstractBoxLayoutConnector.java
client/src/com/vaadin/client/ui/orderedlayout/HorizontalBoxLayoutConnector.java
client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java
client/src/com/vaadin/client/ui/orderedlayout/VBoxLayout.java
client/src/com/vaadin/client/ui/orderedlayout/VerticalBoxLayoutConnector.java
client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java
client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
shared/src/com/vaadin/shared/ComponentState.java
tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
tests/testbench/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
tests/testbench/com/vaadin/tests/themes/LiferayThemeTest.java
uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html