diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /examples/webkit/webkit-guide/_image_assets.htm | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'examples/webkit/webkit-guide/_image_assets.htm')
| -rw-r--r-- | examples/webkit/webkit-guide/_image_assets.htm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/webkit/webkit-guide/_image_assets.htm b/examples/webkit/webkit-guide/_image_assets.htm index 5640e2c3c4..5f27cfa7e8 100644 --- a/examples/webkit/webkit-guide/_image_assets.htm +++ b/examples/webkit/webkit-guide/_image_assets.htm @@ -3,7 +3,6 @@ This file is part of QtWebKit Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. You may use this file under the terms of the BSD license as follows: |