diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-13 21:54:47 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-13 21:54:47 +0200 |
| commit | fa903eba4bcb4d2adefba277158a793f5a704b0a (patch) | |
| tree | b078b59c014f27bd44de7e4087448c86275fc054 /qtandroidextras | |
| parent | bac199faa3c7bbaa3e51400b72de4171b4dcbd63 (diff) | |
| parent | e48d65315076311b0e371efc4533aacb839b9418 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
Diffstat (limited to 'qtandroidextras')
0 files changed, 0 insertions, 0 deletions