From: Artur Signell <artur@vaadin.com>
Date: Fri, 30 Mar 2012 15:39:21 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/6.8'
X-Git-Tag: 7.0.0.alpha2~175
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7dc23cacce4c98c5c4a9fbf0b0044d7a312de3c3;p=vaadin-framework.git

Merge remote-tracking branch 'origin/6.8'

Conflicts:
	tests/test.xml
---

7dc23cacce4c98c5c4a9fbf0b0044d7a312de3c3
diff --cc tests/test.xml
index dd308ce0a9,fbb0a3a019..28459c37e9
--- 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-firefox10,winxp-safari5,winxp-googlechrome17,winxp-opera11" />
 -	<property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox11,winxp-safari4,winxp-safari5,winxp-googlechrome13,winxp-googlechrome18,winxp-opera1060,winxp-opera11" />
++	<property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox11,winxp-safari5,winxp-googlechrome18,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" />