diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-15 15:38:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-15 15:38:48 (GMT) |
| commit | ab90235dfa1874e5c70875ed9b68817e698a55b3 (patch) | |
| tree | 819e6302328b79ddef9cf97246949f57d885dd30 /src/3rdparty/libpng/LICENSE | |
| parent | 04d0a534c6fe64d308652da2ada109c7d6bd72ed (diff) | |
| parent | e5fe06c4b76eea0f1755419bfb6b89325824a852 (diff) | |
| download | Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.zip Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.tar.gz Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert accidental commit
Rework threading internals in XmlListModel to avoid global static
Fix undesirable VKB popup at task switch
Fix compile errors on S60 3.2
Fix to QGLWidget rendering with VG graphics system
Symbian/gcce: Remove the useless -T flag
Fix installation on S60 5.0
Fix fancybrowser.pro
Move cursorDelegate with the mouse selection of read only text input.
Ignore child elements in non-application caption/pkg name translations
Updating libpng: Patches to libpng 1.5.4 for building it in Qt
Updating libpng: Add libpng version 1.5.4
Updating libpng: Remove version 1.4.0
Diffstat (limited to 'src/3rdparty/libpng/LICENSE')
| -rw-r--r-- | src/3rdparty/libpng/LICENSE | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/libpng/LICENSE b/src/3rdparty/libpng/LICENSE index b28f15c..89f5243 100644 --- a/src/3rdparty/libpng/LICENSE +++ b/src/3rdparty/libpng/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 3, 2011 +July 7, 2011 |