diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg')
-rwxr-xr-x | examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg | bin | 0 -> 534775 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg Binary files differnew file mode 100755 index 000000000..f69e947c0 --- /dev/null +++ b/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg |