summaryrefslogtreecommitdiffstats
path: root/doc/src/getting-started/examples.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 19:22:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 19:22:37 (GMT)
commit2b78291003543d45d176424d6d9624d0c02c273c (patch)
treeab21561d2ca288b7b52f8e4d3ab757b50f2ede06 /doc/src/getting-started/examples.qdoc
parent50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (diff)
parentc7afbc97d4cb60ed11996d0bcbbddaac2b18d18c (diff)
downloadQt-2b78291003543d45d176424d6d9624d0c02c273c.zip
Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.gz
Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'doc/src/getting-started/examples.qdoc')
-rw-r--r--doc/src/getting-started/examples.qdoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index a145e24..5230b7e 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -53,7 +53,8 @@
deliberately show off Qt's features. You might want to look at
these as well.
- These examples are provided under the terms of the \l{BSD License}.
+ These examples are provided under the terms of the
+ \l{New and Modified BSD Licenses}{Modified BSD License}.
\section1 Examples by Functional Area