diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:43:36 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:46:48 +0200 |
| commit | 8fc4f99e468a279e6bb8442adad6b6a46d1be1c3 (patch) | |
| tree | dfd0540ecac0bc86594e9e997d7e979e40dacc6d /examples/webkit/webkit-guide/layout_tbl-keyhole.htm | |
| parent | d3921cce47f834dd37cf0bb4085ba242dbbe2412 (diff) | |
| parent | f7241e8cb949ecf2d86fae2a759a8e1fdb148a26 (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If2168c519daf45390af04af9ef9722770453a493
Diffstat (limited to 'examples/webkit/webkit-guide/layout_tbl-keyhole.htm')
| -rw-r--r-- | examples/webkit/webkit-guide/layout_tbl-keyhole.htm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/webkit/webkit-guide/layout_tbl-keyhole.htm b/examples/webkit/webkit-guide/layout_tbl-keyhole.htm index 6826f7e940..005f7ffb5e 100644 --- a/examples/webkit/webkit-guide/layout_tbl-keyhole.htm +++ b/examples/webkit/webkit-guide/layout_tbl-keyhole.htm @@ -2,7 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +Contact: http://www.qt-project.org/legal You may use this file under the terms of the BSD license as follows: @@ -17,7 +18,7 @@ o Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -o Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +o Neither the name of Digia Plc and its Subsidiary(-ies) nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. |