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/integration_tests.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/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 22ad356338..3350a0d215 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -13,7 +13,7 @@ <fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run" /> <!-- Test with these browsers --> - <property name="test_browsers" value="winxp-firefox9" /> + <property name="test_browsers" value="winxp-firefox10" /> <!-- Path to key file. Default value --> <property name="sshkey.file" value="id_dsa" /> |