diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:05:02 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:05:02 +0200 |
commit | e128207f753da7f98cb4906775ad517cbbb0c4fb (patch) | |
tree | 1b2bfdc45cdbdcb7164529a8ae7d3fee6e46bb57 /src/plugins/android/src/wrappers | |
parent | ca94dc79b6f0e57ba7446a87c70398a178fbcac8 (diff) | |
parent | 2d911d4e0926969528be8e170a02f74f4761ee25 (diff) |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I716fd3acb69e424047691069cd4a781f656d0487
Diffstat (limited to 'src/plugins/android/src/wrappers')
0 files changed, 0 insertions, 0 deletions