Ansariel
|
68e5f326b3
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# .gitignore
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/GLEXT.cmake
# indra/cmake/LLCommon.cmake
# indra/cmake/LLMath.cmake
# indra/cmake/LLRender.cmake
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/llrender/llglheaders.h
# indra/llrender/llglslshader.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llface.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llxmlrpctransaction.cpp
|
2023-03-31 18:54:16 +02:00 |
|
Nicky
|
ab4ddc2710
|
viewer-manager for Linux x64.
|
2018-03-27 18:27:30 +02:00 |
|
Nicky
|
9ebaa69d4e
|
Linux: Do not use ViewerManager (yet).
|
2018-03-26 11:27:18 +02:00 |
|
Glenn Glazer
|
2150e038e8
|
update vmp package to 505332
|
2017-05-17 14:01:53 -07:00 |
|
Glenn Glazer
|
b69831b691
|
SL-321: add new ViewerManager.cmake file, knowingly overriding commit hooks
|
2017-03-06 15:36:50 -08:00 |