diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-05-04 09:05:58 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-05-04 09:05:58 +0300 |
| commit | e6738e64dc2f7db1733aa568fd2713632b9f8966 (patch) | |
| tree | 1353d11c5d37ddfe4b15dd97cf11d50149d9286b /tests/test.xml | |
| parent | 46c74e7362271ccbcf54c506657d8c0846a61858 (diff) | |
| parent | b1ef06fdb8d1dc03dba2afb397aed89089ac5445 (diff) | |
| download | vaadin-framework-e6738e64dc2f7db1733aa568fd2713632b9f8966.tar.gz vaadin-framework-e6738e64dc2f7db1733aa568fd2713632b9f8966.zip | |
Merge remote branch 'origin/6.8'
Conflicts:
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
src/com/vaadin/terminal/gwt/client/BrowserInfo.java
src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
src/com/vaadin/terminal/gwt/client/ui/VButton.java
src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
src/com/vaadin/terminal/gwt/client/ui/VNotification.java
src/com/vaadin/terminal/gwt/client/ui/VView.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
src/com/vaadin/terminal/gwt/server/RequestTimer.java
src/com/vaadin/ui/Button.java
tests/test.xml
tests/testbench/com/vaadin/tests/components/TouchScrollables.java
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 28459c37e9..67e48ee137 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-firefox11,winxp-safari5,winxp-googlechrome18,winxp-opera11" /> + <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox12,winxp-safari5,winxp-googlechrome18,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" /> |