diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-08-15 14:19:17 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-08-15 14:19:17 (GMT) |
| commit | e5fe06c4b76eea0f1755419bfb6b89325824a852 (patch) | |
| tree | 3f82e0f4307e3552e5d4ddec7ca05417cbc8c942 /src/3rdparty/libpng/LICENSE | |
| parent | bda5fd63ae9c1aa16492fad26dcabeffb8bd8db4 (diff) | |
| parent | f11bdd5bd0b46f759e4711de1c2c3ef5006433fa (diff) | |
| download | Qt-e5fe06c4b76eea0f1755419bfb6b89325824a852.zip Qt-e5fe06c4b76eea0f1755419bfb6b89325824a852.tar.gz Qt-e5fe06c4b76eea0f1755419bfb6b89325824a852.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
examples/webkit/fancybrowser/fancybrowser.pro
src/3rdparty/libpng/ANNOUNCE
src/3rdparty/libpng/CHANGES
src/3rdparty/libpng/CMakeLists.txt
src/3rdparty/libpng/LICENSE
src/3rdparty/libpng/README
src/3rdparty/libpng/configure.ac
src/3rdparty/libpng/example.c
src/3rdparty/libpng/libpng-manual.txt
src/3rdparty/libpng/libpng.3
src/3rdparty/libpng/libpngpf.3
src/3rdparty/libpng/png.5
src/3rdparty/libpng/png.c
src/3rdparty/libpng/png.h
src/3rdparty/libpng/pngconf.h
src/3rdparty/libpng/pngerror.c
src/3rdparty/libpng/pnginfo.h
src/3rdparty/libpng/pnglibconf.h
src/3rdparty/libpng/pngmem.c
src/3rdparty/libpng/pngpread.c
src/3rdparty/libpng/pngpriv.h
src/3rdparty/libpng/pngread.c
src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrutil.c
src/3rdparty/libpng/pngset.c
src/3rdparty/libpng/pngstruct.h
src/3rdparty/libpng/pngtest.c
src/3rdparty/libpng/pngtrans.c
src/3rdparty/libpng/pngvalid.c
src/3rdparty/libpng/pngwrite.c
src/3rdparty/libpng/pngwtran.c
src/3rdparty/libpng/pngwutil.c
src/gui/dialogs/qfiledialog_symbian.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/s60installs/s60installs.pro
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 |