summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-08-06 11:46:15 +0200
committerLiang Qi <liang.qi@qt.io>2019-08-06 11:46:15 +0200
commit13b206662bf3c3cb5eaf2e977d457fd1a7c3fa50 (patch)
tree7e7ea027376ad0dbf9f5f65ae18e03e0f30cde5f /coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export
parenta268fb46895f694a58da2389fd47ca393a68deef (diff)
parent2fb0e4f3521327d7d44b012316fb9e79c11f4366 (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/zlib/1.2.8/annulen/stable/export')
-rw-r--r--coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
deleted file mode 100644
index d7806e94..00000000
--- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-1479836260
-CMakeLists.txt: 6ce169fb0b2f6eaa5d054d1dc007fc81
-FindZLIB.cmake: 4b85e65d40b77da736416f28e5931e56
-conanfile.py: e8de244463aa84c51238f1fd22a1ae00 \ No newline at end of file