phoenix-firestorm

Author	SHA1	Message	Date
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
Steven Bennetts	25c10ed028	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release dataserver-is-deprecated	2008-06-26 00:39:00 +00:00
Steven Bennetts	b5936a4b1d	1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)	2008-04-03 19:21:14 +00:00
Steven Bennetts	941cb9f412	merge release@83343 skinning-1-merge@83714 -> release QAR-424	2008-04-01 17:45:04 +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