summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2014-10-01 16:21:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-10-01 16:21:12 +0200
commit8ee9774e67edf57d891528749a360a0af8f0c6f7 (patch)
treee0b7d4b19c26c48fe41e930532f2037f8dc43204 /src/android
parentd78fb442d750b33afe2e41f31588ec94cf4023ad (diff)
parent8ab25620d3df25c43011ae982f4614639578afb3 (diff)
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/android')
0 files changed, 0 insertions, 0 deletions