diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-12 12:51:53 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-12 21:13:56 +0100 |
commit | c2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch) | |
tree | 35d0320171ad60a4e25c41f0718d02016dfd4242 /coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt | |
parent | ab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff) | |
parent | 19872ea84352182ee974ff84d2e3872a21427117 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
Diffstat (limited to 'coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt')
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt | 4 |
1 files changed, 4 insertions, 0 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 new file mode 100644 index 00000000..d7806e94 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt @@ -0,0 +1,4 @@ +1479836260 +CMakeLists.txt: 6ce169fb0b2f6eaa5d054d1dc007fc81 +FindZLIB.cmake: 4b85e65d40b77da736416f28e5931e56 +conanfile.py: e8de244463aa84c51238f1fd22a1ae00
\ No newline at end of file |