diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-23 16:38:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-23 16:38:06 +0200 |
| commit | 44073f55632e7848d372a60c4417bbc8664afd2c (patch) | |
| tree | 6fcebed721da0d0049ae1413538e8f6bf9dfbf92 /coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt | |
| parent | 709e687c84c67ba8faf2411c081b29f25d76de4e (diff) | |
| parent | fd87ff83aafc0f103538376591e9f36dfeb1410d (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
Diffstat (limited to 'coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt')
| -rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt new file mode 100644 index 00000000..0685a515 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/export/conanmanifest.txt @@ -0,0 +1,4 @@ +1563317256 +LICENSE.md: 5aa9930034582b90e2008d2c609d1317 +conanfile.py: f80221898becb58bc0de993097f98818 +export_source/CMakeLists.txt: eb0fcc86f467a4c6ac9f37c16887a29f |