diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-02 09:01:44 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-02 09:02:23 +0100 |
commit | 2c27ccd1c9a821edd071cae6336ecb2066ce2ab7 (patch) | |
tree | faabf3a283501256bd3c4065273a651174657736 /coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt | |
parent | aed00a8dd39786519bdf5b6f5627cad6c006a8ce (diff) | |
parent | d379d768e6b9e6d9b432117ad8c803ce7ed9e7e5 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt new file mode 100644 index 00000000..685e4549 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.manifests/icu/57.1/vitallium/stable/export/conanmanifest.txt @@ -0,0 +1,2 @@ +1478098249 +conanfile.py: f66225cf233d8eee6c6c6b4832d81b79
\ No newline at end of file |