diff options
| author | callum_linden <none@none> | 2018-01-05 18:27:30 -0800 | 
|---|---|---|
| committer | callum_linden <none@none> | 2018-01-05 18:27:30 -0800 | 
| commit | a656e4a001013cdbfb3961e9aecfa88ea5890bbb (patch) | |
| tree | 27bca06c3d670812206bd4862ebf1d62b7fcc45b /indra | |
| parent | aa23ae29a557df8346db35972198b4d6cee7761b (diff) | |
| parent | 6659192a351f61a1c2476a6d34cc5fd6c8d6123f (diff) | |
Automated merge with tip of viewer64
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/xui/en/mime_types.xml | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index 8a810f32a6..de9ac4247f 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -526,7 +526,7 @@  			movie  		</widgettype>  		<impl> -			media_plugin_cef +			media_plugin_libvlc  		</impl>  	</mimetype>  </mimetypes> | 
