diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-12 12:01:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-12 12:01:38 (GMT) |
| commit | e4f5a81869e75a998278c19134f2772fefd998fe (patch) | |
| tree | 43d07fd63500f9a6918655431c548907f8ecc2ae /doc | |
| parent | 28ad5063e0fd3e268408a2483c06413a454a2a61 (diff) | |
| parent | 60354895d4207a3198b2546e7b4dfcfa2051aa07 (diff) | |
| download | Qt-e4f5a81869e75a998278c19134f2772fefd998fe.zip Qt-e4f5a81869e75a998278c19134f2772fefd998fe.tar.gz Qt-e4f5a81869e75a998278c19134f2772fefd998fe.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix qdoc error.
Quiet qmake warnings during configure.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/external-resources.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index cbd66ee..61c9da2 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -416,5 +416,5 @@ /*! \externalpage http://opensource.org/licenses/bsd-license.php - \title New and Modified BSD Licenses -*/
\ No newline at end of file + \title BSD License +*/ |