4 Commits (ec7dbc704040dfcdcd101f090dbb2f780ca0ee8a)

Author	SHA1	Message	Date
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
Steven Bennetts	9ec432034d	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ... ignore-dead-branch	2009-06-21 08:04:56 +00:00
Aaron Brashears	e3cf284388	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
Melinda Green	e1d8dac25a	svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge ... Resolving QAR-1051 Merge featurettes batch #4	2008-12-15 21:21:19 +00:00