diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-13 09:24:47 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-13 10:27:51 +0200 |
| commit | 13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch) | |
| tree | b647be5699145ccae1545096aba5c495d96f8eb5 /bin | |
| parent | 081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff) | |
| parent | de088b5a7f7b57e568399334667b14bfc9e7b893 (diff) | |
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 'bin')
| -rwxr-xr-x | bin/syncqt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/syncqt b/bin/syncqt index 589659f46f..01c519e969 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1,7 +1,7 @@ #!/usr/bin/perl -w ###################################################################### # -# Synchronizes Qt header files - internal Trolltech tool. +# Synchronizes Qt header files - internal development tool. # # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # Contact: Nokia Corporation (qt-info@nokia.com) |