Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

6db0a2a7

Commit 6db0a2a7 authored 11 years ago by Oz Linden

Downloads
- Plain Diff

merge changes for DRTVWR-360

parents cb2bd577 0bc8e67e

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

autobuild.xml 6 additions, 6 deletions

autobuild.xml
indra/cmake/Copy3rdPartyLibs.cmake 3 additions, 1 deletion

indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/FMODEX.cmake 1 addition, 1 deletion

indra/cmake/FMODEX.cmake
indra/llaudio/llaudioengine_fmodex.cpp 15 additions, 10 deletions

indra/llaudio/llaudioengine_fmodex.cpp
indra/llaudio/llaudioengine_fmodex.h 3 additions, 1 deletion

indra/llaudio/llaudioengine_fmodex.h
indra/media_plugins/winmmshim/winmm_shim.cpp 50 additions, 31 deletions

indra/media_plugins/winmmshim/winmm_shim.cpp
indra/newview/viewer_manifest.py 15 additions, 2 deletions

indra/newview/viewer_manifest.py

with 93 additions and 52 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