]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/master' into layoutperformance
authorLeif Åstrand <leif@vaadin.com>
Wed, 8 Feb 2012 07:21:24 +0000 (09:21 +0200)
committerLeif Åstrand <leif@vaadin.com>
Wed, 8 Feb 2012 07:21:24 +0000 (09:21 +0200)
commit2be547521ac5497e15fc8f2b997611e8f8dfd9fe
tree863c0f1d59b52b1d0d6baf5c5cc89f78b0adddad
parentd434bfd1d35f576a3b9ae5f3288464990a6106dd
parent2bb7aae1c0cd44ad1ca260dec70b3225c8a226ac
Merge remote branch 'origin/master' into layoutperformance

Conflicts:
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
src/com/vaadin/terminal/gwt/client/ui/VOrderedLayoutPaintable.java
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayoutPaintable.java