]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into layoutgraph
authorJohn Ahlroos <john@vaadin.com>
Mon, 3 Sep 2012 08:41:06 +0000 (11:41 +0300)
committerJohn Ahlroos <john@vaadin.com>
Mon, 3 Sep 2012 08:41:06 +0000 (11:41 +0300)
commit971b0684482dd3b7eb4efac09b9c24e1ea2b305d
tree6d6a4be640837500cfaa2f805a8602a9f4803871
parent340cd7899812b444941584d383d930fe8155159b
parentf85c152a48686a8a0dca38ca12b4f3509cac056f
Merge branch 'master' into layoutgraph

Conflicts:
shared/src/com/vaadin/shared/ComponentState.java
client/src/com/vaadin/client/ComponentLocator.java
client/src/com/vaadin/client/LayoutManager.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
shared/src/com/vaadin/shared/ComponentState.java