diff options
| author | Artur Signell <artur@vaadin.com> | 2011-11-11 14:56:05 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2011-11-11 14:56:05 +0200 |
| commit | ad88db568d8c02a86e1440665897ce293d66f175 (patch) | |
| tree | 6a33a959eb3d6586ba297c76eed5b0a470d483cc /tests/test.xml | |
| parent | c13992f13ff1cc335d0b11e2dcabb00592217c77 (diff) | |
| parent | ec0ebd69a108ff21a6768f957cfe99089f03bd48 (diff) | |
| download | vaadin-framework-ad88db568d8c02a86e1440665897ce293d66f175.tar.gz vaadin-framework-ad88db568d8c02a86e1440665897ce293d66f175.zip | |
Merge remote branch 'origin/6.8'
Diffstat (limited to 'tests/test.xml')
| -rw-r--r-- | tests/test.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test.xml b/tests/test.xml index 5dfb429d74..e0f9f3af39 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -6,8 +6,8 @@ <!-- ================================================================== --> <!-- Browsers to use for testing --> <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox8,winxp-safari5,winxp-googlechrome-stable,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" />--> + <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" /> <property name="browsers" value="${browsers-windows}" /> |