diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:51:08 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:51:08 +0300 |
| commit | 2e837e538925056be5aa6edc3d358b1f447b5f39 (patch) | |
| tree | 506f73cc9a317b37a9d5dc344681363116630752 /indra/llcorehttp | |
| parent | f3deec8851dd03470bf68fcf2cffda1fc3fa44d8 (diff) | |
| parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) | |
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 6a301ad50d..c591680250 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -7,7 +7,7 @@ include(GoogleMock) include(CURL) include(OpenSSL) include(NGHTTP2) -include(ZLIB) +include(ZLIBNG) include(LLCoreHttp) include(LLAddBuildTest) include(LLMessage) |