From: Artur Signell <artur@vaadin.com>
Date: Fri, 3 Feb 2012 20:26:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/6.8'
X-Git-Tag: 7.0.0.alpha2~467
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=04dabc72d1cce709c848b52d0f83f331104ebe92;p=vaadin-framework.git

Merge remote-tracking branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
	tests/test.xml
---

04dabc72d1cce709c848b52d0f83f331104ebe92
diff --cc tests/test.xml
index 9d060c9a29,5322215c6d..2baa26218a
--- a/tests/test.xml
+++ b/tests/test.xml
@@@ -11,7 -5,7 +11,7 @@@
  	<!-- Configuration                                                      -->
  	<!-- ================================================================== -->
  	<!-- Browsers to use for testing -->
- 	<property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox9,winxp-safari5,winxp-googlechrome-stable,winxp-opera11" />
 -	<property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox10,winxp-safari4,winxp-safari5,winxp-googlechrome13,winxp-googlechrome-stable,winxp-opera1060,winxp-opera11" />
++	<property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox10,winxp-safari5,winxp-googlechrome-stable,winxp-opera11" />
  	<property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
  	<property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />