]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/master' into layoutgraph
authorLeif Åstrand <leif@vaadin.com>
Tue, 17 Apr 2012 11:18:05 +0000 (14:18 +0300)
committerLeif Åstrand <leif@vaadin.com>
Tue, 17 Apr 2012 11:18:05 +0000 (14:18 +0300)
commita5f128853ac604983270175b0a5c971f5d951a5d
tree23d8dd79adfead7f527541c66c1603027d287955
parentc23beb2c030cc21bc50be4541123160912553729
parent4d2b5c2ab1ddf5194458270807d4cc476618ef76
Merge remote branch 'origin/master' into layoutgraph

Conflicts:
WebContent/VAADIN/themes/base/paintable/paintable.css
WebContent/VAADIN/themes/base/paintable/paintable.css
src/com/vaadin/terminal/gwt/client/LayoutManager.java
src/com/vaadin/terminal/gwt/client/ServerConnector.java
src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java
src/com/vaadin/terminal/gwt/client/ui/HorizontalBoxLayoutConnector.java
src/com/vaadin/terminal/gwt/client/ui/VerticalBoxLayoutConnector.java