diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:32 +0200 |
| commit | 720118ea73431a0808f0c60dfec10f16fd85af7f (patch) | |
| tree | 5505c3286c6a7330fe19f144c74a9a77b19751f2 /src/imports/nfc/qdeclarativenearfield.cpp | |
| parent | 9e70578b18eb7246f5d11dd2afdbea8bb1150768 (diff) | |
| parent | e86249d3d08b5592c6a3d3d86e3119dd1436e816 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ic4c332470e9c5989deb6109c826dcb38ff038a8b
Diffstat (limited to 'src/imports/nfc/qdeclarativenearfield.cpp')
0 files changed, 0 insertions, 0 deletions