diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-24 06:03:27 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-24 06:03:27 (GMT) |
| commit | f8fabc79d74b3043ca524b6376d662f46b4a7f2e (patch) | |
| tree | f4c9b40988d55ca64950626e6e63f8fd644d20ed /src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h | |
| parent | 232fa760b0fb304116f0d17c3e7c25fdcea3d6bf (diff) | |
| parent | ede5f8cb8ae1fcc7631cc05e9c57c0cfa5790ef5 (diff) | |
| download | Qt-f8fabc79d74b3043ca524b6376d662f46b4a7f2e.zip Qt-f8fabc79d74b3043ca524b6376d662f46b4a7f2e.tar.gz Qt-f8fabc79d74b3043ca524b6376d662f46b4a7f2e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Conflicts:
demos/embedded/fluidlauncher/pictureflow.cpp
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
tests/auto/moc/os9-newlines.h
tests/auto/qsqldatabase/tst_databases.h
tools/xmlpatterns/main.h
tools/xmlpatterns/qcoloringmessagehandler_p.h
tools/xmlpatterns/qcoloroutput.cpp
tools/xmlpatterns/qcoloroutput_p.h
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h index 03b813a..19814e8 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h @@ -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$ ** ****************************************************************************/ |