diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 16:12:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 16:12:06 +0200 |
| commit | f870501469c9165f16c792e1167a8a897a3b0d5a (patch) | |
| tree | a9f6c4e36ab0d244b3f9e58a69f03ae7391c9aec /.tag | |
| parent | 3e5a32e9a40916e0bae882ba22b9d2b1131d6326 (diff) | |
| parent | 80ceeeed3c15d307784be66b5dafdc9cfc12b8cb (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/nfc/doc/src/nfc-index.qdoc
Change-Id: Ie12d3023ff934f6579ae93617c95fc654e85a7f0
Diffstat (limited to '.tag')
0 files changed, 0 insertions, 0 deletions