diff options
| author | Artur Signell <artur@vaadin.com> | 2013-03-21 08:59:51 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-03-21 08:59:51 +0200 |
| commit | bd3bb24a36a0ad02ffb9cee2e46afc445a354191 (patch) | |
| tree | 00d9248c84f8b7b60768552c822279c9cf151f45 /uitest/test.xml | |
| parent | 320b4e3776976e5dad822f01542f338cf76140bb (diff) | |
| parent | e4c9eda51082a443822b66864df2fe14be7dc6d7 (diff) | |
| download | vaadin-framework-bd3bb24a36a0ad02ffb9cee2e46afc445a354191.tar.gz vaadin-framework-bd3bb24a36a0ad02ffb9cee2e46afc445a354191.zip | |
Merge commit 'e4c9eda51082a443822b66864df2fe14be7dc6d7'
Conflicts:
uitest/test.xml
Change-Id: I2c82fa7117b21bddad313abdd2f3f43143317c12
Diffstat (limited to 'uitest/test.xml')
| -rw-r--r-- | uitest/test.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uitest/test.xml b/uitest/test.xml index e2c14b53af..5ff39c425d 100644 --- a/uitest/test.xml +++ b/uitest/test.xml @@ -8,7 +8,7 @@ <!-- Configuration --> <!-- ================================================================== --> <!-- Browsers to use for testing --> - <property name="browsers-windows" value="winxp-ie8,win7-ie9,win7-ie10,winxp-firefox17-esr,winxp-safari5,winxp-googlechrome21,winxp-opera11" /> + <property name="browsers-windows" value="winxp-ie8,win7-ie9,win7-ie10,winxp-firefox17-esr,winxp-safari5,winxp-googlechrome21,winxp-opera12" /> <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" /> |