Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

238f9350

Commit 238f9350 authored 8 years ago by callum@lindenlab.com

Downloads
- Plain Diff

Automated merge with head of callum_linden/viewer64-xcode8

parents 13ec15be ac9777bd

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

autobuild.xml 13 additions, 1 deletion

autobuild.xml
indra/cmake/LibVLCPlugin.cmake 4 additions, 0 deletions

indra/cmake/LibVLCPlugin.cmake
indra/media_plugins/CMakeLists.txt 1 addition, 0 deletions

indra/media_plugins/CMakeLists.txt
indra/media_plugins/cef/CMakeLists.txt 0 additions, 20 deletions

indra/media_plugins/cef/CMakeLists.txt
indra/media_plugins/cef/media_plugin_cef.cpp 1 addition, 5 deletions

indra/media_plugins/cef/media_plugin_cef.cpp
indra/media_plugins/libvlc/media_plugin_libvlc.cpp 4 additions, 0 deletions

indra/media_plugins/libvlc/media_plugin_libvlc.cpp
indra/newview/CMakeLists.txt 1 addition, 3 deletions

indra/newview/CMakeLists.txt
indra/newview/skins/default/xui/en/mime_types_mac.xml 16 additions, 16 deletions

indra/newview/skins/default/xui/en/mime_types_mac.xml
indra/newview/viewer_manifest.py 16 additions, 2 deletions

indra/newview/viewer_manifest.py

with 56 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment