Ansariel 1fc3aaff9b Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # .gitignore # autobuild.xml # indra/CMakeLists.txt # indra/cmake/00-Common.cmake # indra/cmake/Boost.cmake # indra/cmake/BuildVersion.cmake # indra/cmake/CEFPlugin.cmake # indra/cmake/CMakeLists.txt # indra/cmake/CURL.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/DBusGlib.cmake # indra/cmake/DragDrop.cmake # indra/cmake/FMODSTUDIO.cmake # indra/cmake/FindHUNSPELL.cmake # indra/cmake/FindJsonCpp.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/FindURIPARSER.cmake # indra/cmake/FreeType.cmake # indra/cmake/GLH.cmake # indra/cmake/Hunspell.cmake # indra/cmake/JsonCpp.cmake # indra/cmake/LLKDU.cmake # indra/cmake/LLPhysicsExtensions.cmake # indra/cmake/LLPlugin.cmake # indra/cmake/LLWindow.cmake # indra/cmake/Linking.cmake # indra/cmake/MESHOPTIMIZER.cmake # indra/cmake/MediaPluginBase.cmake # indra/cmake/NGHTTP2.cmake # indra/cmake/OPENAL.cmake # indra/cmake/OpenGL.cmake # indra/cmake/OpenJPEG.cmake # indra/cmake/OpenSSL.cmake # indra/cmake/PNG.cmake # indra/cmake/Tracy.cmake # indra/cmake/UI.cmake # indra/cmake/Variables.cmake # indra/cmake/ViewerMiscLibs.cmake # indra/cmake/ZLIBNG.cmake # indra/cmake/bugsplat.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/linux_crash_logger/CMakeLists.txt # indra/llaudio/CMakeLists.txt # indra/llcommon/CMakeLists.txt # indra/llcommon/llapp.cpp # indra/llcorehttp/CMakeLists.txt # indra/llimagej2coj/CMakeLists.txt # indra/llinventory/CMakeLists.txt # indra/llmath/CMakeLists.txt # indra/llmath/llcalcparser.h # indra/llmessage/CMakeLists.txt # indra/llprimitive/CMakeLists.txt # indra/llrender/CMakeLists.txt # indra/llrender/llglslshader.cpp # indra/llwindow/CMakeLists.txt # indra/media_plugins/CMakeLists.txt # indra/media_plugins/base/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.cpp # indra/newview/llxmlrpclistener.cpp # indra/newview/llxmlrpctransaction.cpp # indra/newview/viewer_manifest.py # indra/test/CMakeLists.txt		2022-09-17 23:12:34 +02:00
..
CMakeLists.txt	Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer	2022-09-17 23:12:34 +02:00
media_plugin_example.cpp	SL-3704 Plugin exit issues	2019-07-01 17:28:58 +03:00