vaadin-framework/tests/server-side/com/vaadin
Leif Åstrand 0628eea037 Merge remote branch 'origin/6.8'
Conflicts:
	WebContent/release-notes.html
	tests/test.xml
	tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
2012-02-14 12:48:07 +02:00
..
data/util Merge commit '116cd1f29a432fe5ca64f3023a9fec1ca130f078' (origin/6.8) 2012-01-31 18:49:57 +02:00
terminal/gwt/server Drop support for request attributes used by support for portlet 1.0 2011-11-22 15:49:58 +02:00
tests Merge remote branch 'origin/6.8' 2012-02-14 12:48:07 +02:00