diff options
| author | Artur Signell <artur@vaadin.com> | 2012-03-30 18:39:21 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-03-30 18:39:21 +0300 |
| commit | 7dc23cacce4c98c5c4a9fbf0b0044d7a312de3c3 (patch) | |
| tree | 0128f964bb3ec60c8e0e49ac6e0d51be06cd614a /tests/integration_tests.xml | |
| parent | f38da072d3d3846b987da3160bb458eaa14747e0 (diff) | |
| parent | a6e0d4d7ea1e47a2ced9cb2278e2944e8bbcbe16 (diff) | |
| download | vaadin-framework-7dc23cacce4c98c5c4a9fbf0b0044d7a312de3c3.tar.gz vaadin-framework-7dc23cacce4c98c5c4a9fbf0b0044d7a312de3c3.zip | |
Merge remote-tracking branch 'origin/6.8'
Conflicts:
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 3350a0d215..7bb179056a 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-firefox10" /> + <property name="test_browsers" value="winxp-firefox11" /> <!-- Path to key file. Default value --> <property name="sshkey.file" value="id_dsa" /> |