summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc/src/external-resources.qdoc
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2013-02-17 20:31:38 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-17 20:31:38 +0100
commite88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch)
treec5b05d45e49194d70ff4defae41e5d5d5cf75e80 /src/corelib/doc/src/external-resources.qdoc
parent2df8884bc68343ad96962e7496b98d6e585c0347 (diff)
parente65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/doc/src/external-resources.qdoc')
-rw-r--r--src/corelib/doc/src/external-resources.qdoc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/doc/src/external-resources.qdoc b/src/corelib/doc/src/external-resources.qdoc
index c92f752476..86df385d9e 100644
--- a/src/corelib/doc/src/external-resources.qdoc
+++ b/src/corelib/doc/src/external-resources.qdoc
@@ -64,4 +64,9 @@
/*!
\externalpage http://www.ietf.org/rfc/rfc2045.txt
\title RFC 2045
-*/ \ No newline at end of file
+*/
+
+/*!
+ \externalpage http://www.iana.org/assignments/character-sets/character-sets.xml
+ \title IANA character-sets encoding file
+*/