summaryrefslogtreecommitdiffstats
path: root/doc/src/external-resources.qdoc
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-04-17 14:01:04 +0200
committerAlexis Menard <alexis.menard@nokia.com>2009-04-17 14:01:04 +0200
commit198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (patch)
treee4c99e89cbecd2084a87a8c7a5d4877385fcec1c /doc/src/external-resources.qdoc
parentbb2e4df9bee3148e819c98410aa36e22dad95d7a (diff)
parente85867003ca1741f378b1f58f4dd9d48577a5d9b (diff)
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations
Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'doc/src/external-resources.qdoc')
-rw-r--r--doc/src/external-resources.qdoc5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 8904ddb7da..3bfb5afddb 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -352,3 +352,8 @@
\externalpage http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
\title GNU Lesser General Public License, version 2.1
*/
+
+/*!
+ \externalpage http://developers.sun.com/sunstudio/downloads/patches/index.jsp
+ \title Sun Studio Patches
+*/