summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-10-22 14:26:27 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-10-22 14:26:27 (GMT)
commit5c90ec109b5aa4e20910cfa54b7f05631bc95d71 (patch)
tree1d7109cc5a915e1a98c38f416b70cd9f0349ec62 /doc/src
parentbff3c3daf29e581cd0b8b990491ff9444c63a3e9 (diff)
parentdbff78d964d1a034459074f168b505b41bab0c98 (diff)
downloadQt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.zip
Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.tar.gz
Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/platforms/supported-platforms.qdoc2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 4c3929a..302ecb4 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -106,10 +106,8 @@
\o Compilers
\row \o Windows XP, Vista
\o gcc 3.4.2 (MinGW)
- \omit
\row \o Windows 7
\o MSVC 2008
- \endomit
\row \o Apple Mac OS X 10.6 "Snow Leopard"
\o As provided by Apple
\row \o Apple Mac OS X 10.4 "Tiger"