diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-02-14 12:48:07 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-02-14 12:48:07 +0200 |
| commit | 0628eea037ebb9f47ad77f37c59145082fc2e74c (patch) | |
| tree | b9ed441c79ba1e4acad13aa70ffdb4379cac5ea9 /tests/test.xml | |
| parent | ecd80181d160b58a281eb92fabaa2a10ea0adac2 (diff) | |
| parent | 36f749b4f83086a5306726ad607c9bb3a0fa7526 (diff) | |
| download | vaadin-framework-0628eea037ebb9f47ad77f37c59145082fc2e74c.tar.gz vaadin-framework-0628eea037ebb9f47ad77f37c59145082fc2e74c.zip | |
Merge remote branch 'origin/6.8'
Conflicts:
WebContent/release-notes.html
tests/test.xml
tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
Diffstat (limited to 'tests/test.xml')
| -rw-r--r-- | tests/test.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test.xml b/tests/test.xml index 2baa26218a..f3233de014 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-stable,winxp-opera11" /> + <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox10,winxp-safari5,winxp-googlechrome-17,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" /> |