diff options
| author | Artur Signell <artur@vaadin.com> | 2012-02-03 22:26:47 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-02-03 22:26:47 +0200 |
| commit | 04dabc72d1cce709c848b52d0f83f331104ebe92 (patch) | |
| tree | 1a59a751c51f3f102c59d14d790d66e4379dc23b /tests/test.xml | |
| parent | 4ede774d6c121f51537078ae9890bbf44f835e12 (diff) | |
| parent | 9d18b93a069503a9b9b90bd78836fde687af051d (diff) | |
| download | vaadin-framework-04dabc72d1cce709c848b52d0f83f331104ebe92.tar.gz vaadin-framework-04dabc72d1cce709c848b52d0f83f331104ebe92.zip | |
Merge remote-tracking branch 'origin/6.8'
Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
tests/test.xml
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 9d060c9a29..2baa26218a 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-firefox9,winxp-safari5,winxp-googlechrome-stable,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" /> |