diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-11-16 14:41:58 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-11-16 14:41:58 +0200 |
| commit | e7297ce57aaee0c8da31dc3aec0ec41e50d4b811 (patch) | |
| tree | a3cc5b21d6ad6cc8a768b3443fc4d6bce8996736 | |
| parent | 040c3fd6f2621b3a3403b1e006dbd3d748655475 (diff) | |
| parent | 4b1d80a7b8906bd8ac72e762ea19e3cb55827f6b (diff) | |
| download | vaadin-framework-e7297ce57aaee0c8da31dc3aec0ec41e50d4b811.tar.gz vaadin-framework-e7297ce57aaee0c8da31dc3aec0ec41e50d4b811.zip | |
Merge remote branch 'origin/master' into windowing
| -rw-r--r-- | tests/dummy.txt | 1 | ||||
| -rw-r--r-- | tests/test.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/dummy.txt b/tests/dummy.txt new file mode 100644 index 0000000000..efc8433211 --- /dev/null +++ b/tests/dummy.txt @@ -0,0 +1 @@ +dummy file
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}" /> |