]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Wed, 15 Feb 2012 16:11:57 +0000 (18:11 +0200)
committerLeif Åstrand <leif@vaadin.com>
Wed, 15 Feb 2012 16:11:57 +0000 (18:11 +0200)
commite7792742a7bc1e13ceeffb9561f32d9bc01338b2
treea1c0f110b62b8ecdc54dc5bfe11cdf2adc602cf8
parentc6b25e1cd70e4c0070df500b99f476bf1a1551b1
parent3c2de952974b3e0e82de7951d814fd6312b434af
Merge remote branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/VFilterSelectPaintable.java
tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java