diff options
| author | Richard Nelson <none@none> | 2010-04-27 09:47:33 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-04-27 09:47:33 -0700 |
| commit | 0c643af5289dd20f47b94f4dc7cce1ab9020fba0 (patch) | |
| tree | 053e5b1973fee697393ab42483eefec1634513df | |
| parent | 42c2e62014d835818451cfbb7639db01de09c351 (diff) | |
fixed eol and tabs/spaces problems
| -rw-r--r-- | indra/media_plugins/winmmshim/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/media_plugins/winmmshim/forwarding_api.cpp | 2 | ||||
| -rw-r--r-- | indra/media_plugins/winmmshim/winmm_shim.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt index d35e97fc62..387214088f 100644 --- a/indra/media_plugins/winmmshim/CMakeLists.txt +++ b/indra/media_plugins/winmmshim/CMakeLists.txt @@ -29,6 +29,6 @@ if (WINDOWS) winmm_shim PROPERTIES LINK_FLAGS "/MANIFEST:NO" - OUTPUT_NAME "winmm" + OUTPUT_NAME "winmm" ) endif (WINDOWS) diff --git a/indra/media_plugins/winmmshim/forwarding_api.cpp b/indra/media_plugins/winmmshim/forwarding_api.cpp index aaa229fe9d..17bffdd850 100644 --- a/indra/media_plugins/winmmshim/forwarding_api.cpp +++ b/indra/media_plugins/winmmshim/forwarding_api.cpp @@ -1457,4 +1457,4 @@ extern "C" { //OutputDebugString(L"mciExecute\n"); return mciExecute_orig(pszCommand); } -}
\ No newline at end of file +} diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index a46d908962..974744333a 100644 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -175,4 +175,4 @@ extern "C" { sMute = mute; } -}
\ No newline at end of file +} diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 653dbefa18..668e21c253 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -332,7 +332,7 @@ class WindowsManifest(ViewerManifest): self.path("media_plugin_webkit.dll") self.end_prefix() - # winmm.dll shim + # winmm.dll shim if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst="llplugin"): self.path("winmm.dll") self.end_prefix() |