diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-08-03 14:24:33 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-08-03 14:24:33 +0300 |
| commit | 94f81dc79526a257451c6638a0696e7505227cb7 (patch) | |
| tree | 13f094b896c74032ab86d079362a511f8ce478a1 /tests/test.xml | |
| parent | 406c50ad6cbe537ce709b8958272f93c919e9653 (diff) | |
| parent | bc5831f069f648fbf0d89a863b28d80dc4c2bf35 (diff) | |
| download | vaadin-framework-94f81dc79526a257451c6638a0696e7505227cb7.tar.gz vaadin-framework-94f81dc79526a257451c6638a0696e7505227cb7.zip | |
Merge remote-tracking branch 'origin/6.8'
+ add @Override
Conflicts:
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java
src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/ui/LoginForm.java
src/com/vaadin/ui/Table.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 222fe0a452..9b879ec789 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-firefox12,winxp-safari5,winxp-googlechrome19,winxp-opera11" /> + <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox12,winxp-safari5,winxp-googlechrome21,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" /> |