diff options
| author | axis <qt-info@nokia.com> | 2009-06-02 08:14:04 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-02 08:14:04 (GMT) |
| commit | 3c594257c4aedf113de92c5888e74f676ba87385 (patch) | |
| tree | e309c7502e13f552203b509494a20792125fed29 /src/corelib/tools/qcryptographichash.cpp | |
| parent | 539989f41316329e7aba69ba97e1579eed6036e6 (diff) | |
| parent | 0ff7b68f2e3f184d809cf6fd13ff930efa493e9f (diff) | |
| download | Qt-3c594257c4aedf113de92c5888e74f676ba87385.zip Qt-3c594257c4aedf113de92c5888e74f676ba87385.tar.gz Qt-3c594257c4aedf113de92c5888e74f676ba87385.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
Diffstat (limited to 'src/corelib/tools/qcryptographichash.cpp')
| -rw-r--r-- | src/corelib/tools/qcryptographichash.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index 9063ae4..917679c 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -78,7 +78,7 @@ public: QCryptographicHash can be used to generate cryptographic hashes of binary or text data. - Currently MD4, MD5, and SHA1 are supported. + Currently MD4, MD5, and SHA-1 are supported. */ /*! |