summaryrefslogtreecommitdiff
path: root/indra/media_plugins/winmmshim
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-05-20 00:03:30 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-05-20 00:03:30 +0300
commit445cd962932c1957495a35add8cf5ca4618e035b (patch)
treed0303f3704acb804cb8281f3b7c38010afa423e6 /indra/media_plugins/winmmshim
parent6f5f307e0a751a78fbdfb4c6a1f8757ea55bf1dd (diff)
parentc2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/media_plugins/winmmshim')
-rw-r--r--[-rwxr-xr-x]indra/media_plugins/winmmshim/CMakeLists.txt0
-rw-r--r--[-rwxr-xr-x]indra/media_plugins/winmmshim/forwarding_api.cpp0
-rw-r--r--[-rwxr-xr-x]indra/media_plugins/winmmshim/forwarding_api.h0
-rw-r--r--[-rwxr-xr-x]indra/media_plugins/winmmshim/winmm_shim.cpp0
4 files changed, 0 insertions, 0 deletions
diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt
index 6890589892..6890589892 100755..100644
--- 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 33f0675028..33f0675028 100755..100644
--- 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 1418fc9e1d..1418fc9e1d 100755..100644
--- a/indra/media_plugins/winmmshim/forwarding_api.h
+++ b/indra/media_plugins/winmmshim/forwarding_api.h
diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp
index 78f7a9b0da..78f7a9b0da 100755..100644
--- a/indra/media_plugins/winmmshim/winmm_shim.cpp
+++ b/indra/media_plugins/winmmshim/winmm_shim.cpp