diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 13:24:25 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 14:28:00 +0100 |
| commit | 9316b8c27c4d63ee755517fb4670268424200b3c (patch) | |
| tree | a9818fd5a8798ec56add7cd622fb13cee525557a /tools/scripts | |
| parent | ad46ffd2e74b17cd7e7b8a7d73590696cc8febce (diff) | |
| parent | 03a52863226aeb774721db610ba831808b30836a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/access_token_store_qt.cpp
src/core/access_token_store_qt.h
src/core/content_browser_client_qt.cpp
Change-Id: Id319ad0d87ce071e63d9c6c22b4fc35523ddfa74
Diffstat (limited to 'tools/scripts')
0 files changed, 0 insertions, 0 deletions