diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 00:37:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 00:37:55 (GMT) |
| commit | bf521a9a5d7670944658e93fe462c72f800a04f1 (patch) | |
| tree | dd185fe6cdd486b8f281c4e7d82e07598a1404ae | |
| parent | 81a86620bc6664f6b08ea0c1bec89192717c0343 (diff) | |
| parent | ed659771c8f21cd8ca8a06d29b105288439f4e75 (diff) | |
| download | Qt-bf521a9a5d7670944658e93fe462c72f800a04f1.zip Qt-bf521a9a5d7670944658e93fe462c72f800a04f1.tar.gz Qt-bf521a9a5d7670944658e93fe462c72f800a04f1.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Solaris 10 is supported as Tier 2 on x86 architecture as well.
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index a84ad56..578ec37 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -116,7 +116,7 @@ \o aCC 3.57, gcc 3.4 \row \o HPUXi 11.23 \o aCC 6.10 - \row \o Solaris 10 UltraSparc + \row \o Solaris 10 (UltraSparc, x86) \o Sun Studio 12 \row \o AIX 6 \o Power5 xlC 7 |