diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:49:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:49:09 +0200 |
| commit | 66feeb8de70291786499b3008ab8fded4043172a (patch) | |
| tree | 4c2029d9f51b2471c7c8dc0c3be9311640831595 /examples | |
| parent | 7eb41022f19a57505c8eef3497ad6710fc92bd7d (diff) | |
| parent | 15e863517ea37ca7ba6bcb75b078272eddbc5d37 (diff) | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I666d4ca1ad39f81e41a9b47a8828d1689ff2b33e
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qt3d/exampleresources/assets/obj/qt_attribution.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/qt3d/exampleresources/assets/obj/qt_attribution.json b/examples/qt3d/exampleresources/assets/obj/qt_attribution.json index f8064e82a..82c57cdea 100644 --- a/examples/qt3d/exampleresources/assets/obj/qt_attribution.json +++ b/examples/qt3d/exampleresources/assets/obj/qt_attribution.json @@ -9,6 +9,5 @@ "Homepage": "https://share.allegorithmic.com/libraries/2026", "License": "Creative Commons Attribution 4.0", "LicenseId": "CC-BY-4.0", - "LicenseFile": "license.txt", "Copyright": "Copyright (c) 2016, Allegorithmic" } |