summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmediaautoplay.h
AgeCommit message (Collapse)Author
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
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-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-02-21Updated header comments with our public license statement that reflects ↵Callum Prentice
their public nature. DEV-10766 Not reviewed (no code changes - only comments)
2008-02-14svn merge -r 79730:79944 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 02:41:24 +0000