diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-12 17:33:26 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-12 17:33:26 (GMT) |
| commit | 145f445b6c7fa5546540c07f3bda493f4f825caf (patch) | |
| tree | 562fe324044cdc85b65b776ec84e45b0b44f4fa0 /src/network/ssl/qsslcipher.cpp | |
| parent | b467246eb63ec649ad2348ac9b6886ee20dfc033 (diff) | |
| parent | 0cd84ffef786310c12cf7bd314a8922ac1aca1c0 (diff) | |
| download | Qt-145f445b6c7fa5546540c07f3bda493f4f825caf.zip Qt-145f445b6c7fa5546540c07f3bda493f4f825caf.tar.gz Qt-145f445b6c7fa5546540c07f3bda493f4f825caf.tar.bz2 | |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-animations
Diffstat (limited to 'src/network/ssl/qsslcipher.cpp')
| -rw-r--r-- | src/network/ssl/qsslcipher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp index 505c662..7fec2df 100644 --- a/src/network/ssl/qsslcipher.cpp +++ b/src/network/ssl/qsslcipher.cpp @@ -64,9 +64,9 @@ #ifndef QT_NO_DEBUG_STREAM #include <QtCore/qdebug.h> +#endif QT_BEGIN_NAMESPACE -#endif /*! Constructs an empty QSslCipher object. |