diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:53:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:53:55 +0100 |
| commit | 0dc8719647eca19fd0828a86f5e61d21e0b774ad (patch) | |
| tree | 8702726a7044e325511725933ab5979fa43c9e90 /examples/webkitwidgets/browser/browserapplication.cpp | |
| parent | 92fde6d30180b261bfbd6c83429e88dbae4752f5 (diff) | |
| parent | 734663277730bc20dacf0a6b07427002a53cc107 (diff) | |
| download | qtwebkit-examples-0dc8719647eca19fd0828a86f5e61d21e0b774ad.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1
Conflicts:
examples/webkitwidgets/browser/data/defaultbookmarks.xbel
examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp
Change-Id: I5b868d5eb612779b70f8bed123ef85c92caeeb06
Diffstat (limited to 'examples/webkitwidgets/browser/browserapplication.cpp')
0 files changed, 0 insertions, 0 deletions