summaryrefslogtreecommitdiff
path: root/src/scripttools/debugging/qscriptbreakpointdata.cpp
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-13 09:24:47 +0200
committerJason Barron <jbarron@trolltech.com>2009-08-13 10:27:51 +0200
commit13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch)
treeb647be5699145ccae1545096aba5c495d96f8eb5 /src/scripttools/debugging/qscriptbreakpointdata.cpp
parent081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff)
parentde088b5a7f7b57e568399334667b14bfc9e7b893 (diff)
downloadqt4-tools-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.gz
Merge commit 'qt/master'
Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
Diffstat (limited to 'src/scripttools/debugging/qscriptbreakpointdata.cpp')
-rw-r--r--src/scripttools/debugging/qscriptbreakpointdata.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripttools/debugging/qscriptbreakpointdata.cpp b/src/scripttools/debugging/qscriptbreakpointdata.cpp
index 677aa15ea6..94a6a806b6 100644
--- a/src/scripttools/debugging/qscriptbreakpointdata.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointdata.cpp
@@ -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$
**
****************************************************************************/