diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2017-07-11 14:17:28 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2017-07-11 14:17:28 +0200 |
| commit | 2dd6aa017685bd76f3a315871d07fdaef0e6d5f1 (patch) | |
| tree | 3ee522501db89ab9d295bd169298497c0d86309e /examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg | |
| parent | 06fa003da1dc6bc16616f3e687de8513d8b40a1c (diff) | |
| parent | cadfd44c77de9ad3d66e936df140e4ba6efb0d74 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I4ceccd338a937a2ada231f568ed02c7a87bd6e80
Diffstat (limited to 'examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg')
| -rw-r--r--[-rwxr-xr-x] | examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg | bin | 641394 -> 641394 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg Binary files differindex 0e0c20d0a..0e0c20d0a 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg |
