Commit Graph

2 Commits (5fa00a67af6364554c05eb3ca0339770fa6da455)

Author SHA1 Message Date
Tofu Linden 5836902ba0 DEV-44775 pref incorrectly named 'AudioSteamingMedia' in many places 2010-01-05 13:37:37 -08:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00