diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/3rdparty/zlib | |
parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/3rdparty/zlib')
-rw-r--r-- | src/3rdparty/zlib/zconf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index 06e7786cdf..dc52489bc2 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -8,7 +8,7 @@ #ifndef ZCONF_H #define ZCONF_H -/* Since QtCore must export these symbols, define Z_PREFIX to avoid clashes system zlib */ +/* Since Qt Core must export these symbols, define Z_PREFIX to avoid clashes system zlib */ #define Z_PREFIX /* |