summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-02-15 15:48:20 +0200
committerLeif Åstrand <leif@vaadin.com>2012-02-15 15:48:20 +0200
commitba602f376b2a86f66d557c3b8c4d67bac61da017 (patch)
treee8d432c6bf727e9dd0ce3b79392e31c9caf0fdb4 /tests
parent50236af1ceffec30469f2855cd4f12e66f7f1d95 (diff)
parentc6b25e1cd70e4c0070df500b99f476bf1a1551b1 (diff)
downloadvaadin-framework-ba602f376b2a86f66d557c3b8c4d67bac61da017.tar.gz
vaadin-framework-ba602f376b2a86f66d557c3b8c4d67bac61da017.zip
Merge branch 'master' into layoutperformance
Diffstat (limited to 'tests')
-rw-r--r--tests/test.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test.xml b/tests/test.xml
index f3233de014..dd308ce0a9 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -11,7 +11,7 @@
<!-- Configuration -->
<!-- ================================================================== -->
<!-- Browsers to use for testing -->
- <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox10,winxp-safari5,winxp-googlechrome-17,winxp-opera11" />
+ <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox10,winxp-safari5,winxp-googlechrome17,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" />