diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-06-26 14:39:13 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-27 08:46:16 +0200 |
| commit | b12e28a338842e273557413b235de49ec6bb04c3 (patch) | |
| tree | f0c5c82f73116a5edf1168630255e2b0194107f9 /examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png | |
| parent | 8dc95e0edc71cefc6c3e5c4cc67bfe385a8a0f32 (diff) | |
| parent | a2bd6a2a820fc2f2c881102f884df34a190505c7 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Conflicts:
examples/qt3d/planets-qml/CloudEffectDS.qml
examples/qt3d/planets-qml/PlanetButton.qml
examples/qt3d/planets-qml/PlanetEffectD.qml
examples/qt3d/planets-qml/PlanetEffectDB.qml
examples/qt3d/planets-qml/PlanetEffectDS.qml
examples/qt3d/planets-qml/PlanetEffectDSB.qml
examples/qt3d/planets-qml/PlanetMaterial.qml
examples/qt3d/planets-qml/PlanetsMain.qml
examples/qt3d/planets-qml/SolarSystem.qml
examples/qt3d/planets-qml/doc/src/planets-qml.qdoc
examples/qt3d/planets-qml/main.cpp
examples/qt3d/planets-qml/planets-qml.pro
examples/qt3d/planets-qml/planets-qml.qrc
Change-Id: I9f311f3104c8fcf9d49e12b14f8bfad9ca8cf199
Diffstat (limited to 'examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png')
| -rw-r--r-- | examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png | bin | 0 -> 69493 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png b/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 000000000..c62530326 --- /dev/null +++ b/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png |