diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:04:06 +0300 | 
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:04:06 +0300 | 
| commit | e00edbeb4a7edfe4f190ac7bf2197aa8240e50c6 (patch) | |
| tree | 25db350e573224fc2900c1e760f7cf429c599abe /indra/llcorehttp | |
| parent | 3ad10e3075840b442f3a8f4593b4b4f10bad48e0 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
#	doc/contributions.txt
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 1 | 
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 11b2e3e929..240ea2da83 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -178,6 +178,7 @@ if (DARWIN)      libaprutil-1.0.dylib      libexception_handler.dylib      libnghttp2*.dylib +    liburiparser*.dylib      ${EXPAT_COPY}      )  | 
