]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into layoutgraph
authorJohn Ahlroos <john@vaadin.com>
Tue, 28 Aug 2012 06:41:55 +0000 (09:41 +0300)
committerJohn Ahlroos <john@vaadin.com>
Tue, 28 Aug 2012 06:41:55 +0000 (09:41 +0300)
commit435a2e735251464529f8329b0563c26d5b4cc6a9
tree8bde89594f6b258f087a8518265418a02800cea2
parent7b9e1566d6e36c10aef3566b20267449586a81cb
parentc6d43cc88fb0ef4853e07be54fc76a6aa1dc9e23
Merge branch 'master' into layoutgraph

Conflicts:
tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java
client/src/com/vaadin/terminal/gwt/client/LayoutManager.java
client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java