3 Commits (fe253e6ec6f77a7967cadd6efd76b2fbbef4e2da)

Author	SHA1	Message	Date
Oz Linden	a5619d16f7	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04: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
Brad Kittenbrink	6d52efe452	Merge of windlight into release (QAR-286). This includes all changes in ... windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620	2008-02-27 18:58:14 +00:00