diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:08:42 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:08:42 +0100 |
| commit | 2cfc146a260e8ce9e078921336d31d6323852de1 (patch) | |
| tree | 7487a409e29914b335c35e4d310e99389c6c29d1 /examples/webkitwidgets/browser/data/defaultbookmarks.xbel | |
| parent | 66627f658501620438ddddad60373358247c5e0c (diff) | |
| parent | 69a9c9193abe008a9a52640b19a409e4a86c4899 (diff) | |
| download | qtwebkit-examples-2cfc146a260e8ce9e078921336d31d6323852de1.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I90fe6ea3b94f6285d96b4568d57926ee12da57d3
Diffstat (limited to 'examples/webkitwidgets/browser/data/defaultbookmarks.xbel')
0 files changed, 0 insertions, 0 deletions