summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-06-04 09:17:12 -0700
committerRichard Nelson <none@none>2010-06-04 09:17:12 -0700
commitc53afe4f3827f90de1edc024e93401a6817f7c14 (patch)
treed6457534cc63dbdca0a1bf279a71a75a93959f62 /indra/newview
parenta77d273e3ab448d84507bfdb763df8335eadea9e (diff)
parent37392b4b776705b9a0953bda241d351539a2bec9 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/viewer_manifest.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c887097575..8c089c0b79 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -355,7 +355,6 @@ class WindowsManifest(ViewerManifest):
self.path("qtwebkitd4.dll")
self.path("qtxmlpatternsd4.dll")
self.path("ssleay32.dll")
- self.path("winmm.dll")
# For WebKit/Qt plugin runtimes (image format plugins)
if self.prefix(src="imageformats", dst="imageformats"):