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/libxslt/1.1.29/vitallium/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/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, 2 insertions, 0 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 new file mode 100644 index 00000000..de2aa3a0 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt @@ -0,0 +1,2 @@ +1482494842 +conanfile.py: 2472a82109b2d59062d3e50a54d08a4a |