diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
commit | e4dc3567af533df2e57425952c4609726515d2cd (patch) | |
tree | 72824b5efc9a4d6ed9f099d34404076245e164fa /doc/src/howtos/sharedlibrary.qdoc | |
parent | a36e8ca7afd0c15e5ec73bf4ea21464ab89a3662 (diff) | |
parent | dbfedcb31961579499fcb5342ccc42311191bcd4 (diff) | |
download | Qt-e4dc3567af533df2e57425952c4609726515d2cd.zip Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.gz Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.bz2 |
Merge remote branch 'origin/master'
Conflicts:
src/gui/dialogs/qnspanelproxy_mac.mm
Diffstat (limited to 'doc/src/howtos/sharedlibrary.qdoc')
-rw-r--r-- | doc/src/howtos/sharedlibrary.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/howtos/sharedlibrary.qdoc b/doc/src/howtos/sharedlibrary.qdoc index 70fc4db..ed803ed 100644 --- a/doc/src/howtos/sharedlibrary.qdoc +++ b/doc/src/howtos/sharedlibrary.qdoc @@ -42,7 +42,7 @@ /*! \page sharedlibrary.html \title Creating Shared Libraries - + \brief How to create shared libraries. \ingroup best-practices The following sections list certain things that should be taken into |