Skip to content
Snippets Groups Projects
Commit dca3c83c authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R 

# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt
parents ffa8d83e f7838ca1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 234 additions and 821 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment