diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-29 11:40:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-29 11:40:59 +0200 |
commit | a4aa2f296b1c9f8b9eeb995f6818ce39b6b5a288 (patch) | |
tree | b26acdd406abf0ae459f17d941da3ff12080f075 /examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp | |
parent | d72fba3c60af5fd3aba43fd33630f334a5fb2327 (diff) | |
parent | 6a8cfd6e52ad340c80b5a8b862b713192cecf791 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9e9214906c5cda56d0bcc98678c77be69189699d
Diffstat (limited to 'examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp')
-rw-r--r-- | examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp | bin | 25560 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp Binary files differdeleted file mode 100644 index cfb2c583c..000000000 --- a/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp +++ /dev/null |