summaryrefslogtreecommitdiffstats
path: root/doc/src/external-resources.qdoc
diff options
context:
space:
mode:
authorPeter Yard <peter.yard@nokia.com>2010-12-22 06:04:57 (GMT)
committerPeter Yard <peter.yard@nokia.com>2010-12-22 06:04:57 (GMT)
commit53b018a42813e44787aa1edc35d59feaa86cf9d7 (patch)
tree7cce8f18faf26a87cfb5f27d1417c2a2ec86470c /doc/src/external-resources.qdoc
parent55c32b91a298d52bd7c29968d21b4b7a5ee741e4 (diff)
parentafa22a20c1b89960b647b0e3a9dc390fe6f87eae (diff)
downloadQt-53b018a42813e44787aa1edc35d59feaa86cf9d7.zip
Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.gz
Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
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
+*/