diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-16 14:31:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-16 14:31:57 +0100 |
| commit | 563b32ee251dd8d11e9aac3b1494690f10501bdb (patch) | |
| tree | 4adc6d6e2d68850bd58f5b7f167d1deac7be05f5 /qtwebkit | |
| parent | 02353a4b3e94fe8efd3a99aae48be543391bf8a8 (diff) | |
| parent | c8d3a71d7cf7e92224064aa989a9551ee52c9d57 (diff) | |
Merge remote-tracking branch 'gerrit/stable' into release
Conflicts:
qtwebkit-examples
Change-Id: Ifa8735dd8f7ddf3aa74474c983327b94ea2737c5
Diffstat (limited to 'qtwebkit')
| m--------- | qtwebkit | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtwebkit b/qtwebkit -Subproject 4c86230bfe563ef1e3ef493b870203761bc9f32 +Subproject 9b0de4a45f7172710d5722ff302d43efde2c536 |