summaryrefslogtreecommitdiffstats
path: root/doc/src/external-resources.qdoc
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-12-21 23:00:22 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-12-21 23:00:22 (GMT)
commit4c47a46be986681225b67faa73f957276636cc30 (patch)
tree111f23861ce66ca30a17189fb611ff3854b57d66 /doc/src/external-resources.qdoc
parentb696d941c06535b7a7813c4d3b39dbd3710476e4 (diff)
parent27c18a5cd8dbe2d22c8717044922ad5437e6fff4 (diff)
downloadQt-4c47a46be986681225b67faa73f957276636cc30.zip
Qt-4c47a46be986681225b67faa73f957276636cc30.tar.gz
Qt-4c47a46be986681225b67faa73f957276636cc30.tar.bz2
Merge branch '4.7-upstream' into 4.7-water
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 8eeaeb1..9bc3b1c 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -448,3 +448,8 @@
\externalpage https://developer.mozilla.org/en/JavaScript/About_JavaScript
\title About JavaScript
*/
+
+/*!
+ \externalpage http://www.libusb.org/
+ \title libusb
+*/