diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
| commit | 13b206662bf3c3cb5eaf2e977d457fd1a7c3fa50 (patch) | |
| tree | 7e7ea027376ad0dbf9f5f65ae18e03e0f30cde5f /coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt | |
| parent | a268fb46895f694a58da2389fd47ca393a68deef (diff) | |
| parent | 2fb0e4f3521327d7d44b012316fb9e79c11f4366 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.
Conflicts:
.gitmodules
Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
Diffstat (limited to 'coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt')
| -rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt deleted file mode 100644 index de2aa3a0..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -1482494842 -conanfile.py: 2472a82109b2d59062d3e50a54d08a4a |