diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 16:29:13 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 16:29:13 +1000 |
| commit | 0c831b8cf84c72ee8673d1d38f4e93e350dddd5f (patch) | |
| tree | 84fc3c89d73342ec70d77b2bdf99066f987536b8 /doc/src/dnd.qdoc | |
| parent | b98b7d305ffebb700e471bd64a7dee59d947e056 (diff) | |
| parent | 4b1b93f3f97de70af316052bc38048f52631b9e4 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc/src/dnd.qdoc')
| -rw-r--r-- | doc/src/dnd.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/dnd.qdoc b/doc/src/dnd.qdoc index 5ede20ca1..661c62167 100644 --- a/doc/src/dnd.qdoc +++ b/doc/src/dnd.qdoc @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -407,7 +407,7 @@ On X11, Qt also supports drops via the Motif Drag & Drop Protocol. The implementation incorporates some code that was originally written by Daniel Dardailler, and adapted for Qt by Matt Koss <koss@napri.sk> - and Trolltech. Here is the original copyright notice: + and Nokia. Here is the original copyright notice: \legalese Copyright 1996 Daniel Dardailler. |