diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-12 16:36:04 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-12 16:36:04 +0300 |
| commit | 4ceccdc68f1eb3ffcb7b20e20b81877764a9c729 (patch) | |
| tree | b983309f14ef52917d347f2ec21f7a91408c8ed4 /WebContent | |
| parent | 30fb43e8f437d674a750dcbc5626bd251cb5c609 (diff) | |
| parent | abdc1ee5c270658b9f361cace015ff27cc448a68 (diff) | |
| download | vaadin-framework-4ceccdc68f1eb3ffcb7b20e20b81877764a9c729.tar.gz vaadin-framework-4ceccdc68f1eb3ffcb7b20e20b81877764a9c729.zip | |
Merge commit 'abdc1'
Conflicts:
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/release-notes.html | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index 1b56b7fb9c..6f2eb8c2cc 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -76,7 +76,7 @@ purpose of receiving feedback about the changes. </p> - <p>The major changes in this second alpha phase are: + <p>The major changes in this second alpha phase are:</p> <ul> <li>Complete overhaul of the client-server communication architecture @@ -354,15 +354,25 @@ </p> <p> - Vaadin supports the following <b>browsers</b>: + Vaadin supports the following <b>desktop browsers</b>: </p> <ul> - <li>Mozilla Firefox 11</li> + <li>Mozilla Firefox 12</li> <li>Internet Explorer 8-9</li> <li>Safari 5</li> <li>Opera 11</li> - <li>Google Chrome 18</li> + <li>Google Chrome 19</li> + </ul> + + <p> + Additionally, Vaadin supports the built-in browsers in the following + <b>mobile operating systems</b>: + </p> + + <ul> + <li>iOS 4-5</li> + <li>Android 2-4</li> </ul> <h2 id="vaadinontheweb">Vaadin on the Web</h2> |