]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/master' into layoutperformance
authorLeif Åstrand <leif@vaadin.com>
Thu, 23 Feb 2012 07:23:40 +0000 (09:23 +0200)
committerLeif Åstrand <leif@vaadin.com>
Thu, 23 Feb 2012 07:23:40 +0000 (09:23 +0200)
commit541e653a9ed7281d0bd2c2da0c2fef9291b6c391
tree647282dece2b1e7d5fdde2047736e45d1ac631b8
parentffddd126525da62f6c39f70a8926489f3d0664f2
parente896a349a0c41a5c399c6b394fa762eee5d1114c
Merge remote branch 'origin/master' into layoutperformance

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java