diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 21:28:02 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 21:28:02 +0000 |
| commit | d6d2159bf875884bb060aaf8234478dd1ec478b4 (patch) | |
| tree | 6873979584b8d269fb250c35219725598cb9b5d6 /indra/media_plugins/winmmshim | |
| parent | 960139aa6f02f90c6102d3c5d5c38b5ebe689f9c (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge. Pull in viewer-release reflecting new release structure.
Diffstat (limited to 'indra/media_plugins/winmmshim')
| -rwxr-xr-x[-rw-r--r--] | indra/media_plugins/winmmshim/CMakeLists.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/media_plugins/winmmshim/forwarding_api.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/media_plugins/winmmshim/forwarding_api.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/media_plugins/winmmshim/winmm.def | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/media_plugins/winmmshim/winmm_shim.cpp | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt index bf74f81809..bf74f81809 100644..100755 --- a/indra/media_plugins/winmmshim/CMakeLists.txt +++ b/indra/media_plugins/winmmshim/CMakeLists.txt diff --git a/indra/media_plugins/winmmshim/forwarding_api.cpp b/indra/media_plugins/winmmshim/forwarding_api.cpp index 495e08942b..495e08942b 100644..100755 --- a/indra/media_plugins/winmmshim/forwarding_api.cpp +++ b/indra/media_plugins/winmmshim/forwarding_api.cpp diff --git a/indra/media_plugins/winmmshim/forwarding_api.h b/indra/media_plugins/winmmshim/forwarding_api.h index 076a08f769..076a08f769 100644..100755 --- a/indra/media_plugins/winmmshim/forwarding_api.h +++ b/indra/media_plugins/winmmshim/forwarding_api.h diff --git a/indra/media_plugins/winmmshim/winmm.def b/indra/media_plugins/winmmshim/winmm.def index c55a2845f8..c55a2845f8 100644..100755 --- a/indra/media_plugins/winmmshim/winmm.def +++ b/indra/media_plugins/winmmshim/winmm.def diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index 47a1e5c018..47a1e5c018 100644..100755 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp |