summaryrefslogtreecommitdiff
path: root/src/nfc
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2014-12-03 13:59:26 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2014-12-03 13:59:31 +0100
commitd9b50136b15a2236f4f4f01254034ecb87601673 (patch)
treef822c5ab335b28f2b4d6cc86151d163488fe1e63 /src/nfc
parenta6d8c3e479325ab2b52e355fe694cca8dd3b806e (diff)
parent243d396e554b7bd880d63636f315e2cfc7d08099 (diff)
downloadqtconnectivity-d9b50136b15a2236f4f4f01254034ecb87601673.tar.gz
Merge branch 'dev' into neard
Change-Id: Ic427208707d2582ec7bba48ea889e49cf0cd9c31
Diffstat (limited to 'src/nfc')
0 files changed, 0 insertions, 0 deletions