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
Aaron Brashears	90377a270d	Result of svn merge -r85981:85991 svn+ssh://svn/svn/linden/branches/ssl-sanity-merge into release. QAR-487	2008-04-29 18:41:48 +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
Aaron Brashears	5595a99623	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
Kelly Washington	e03bb0606a	merge -r62831:64079 branches/maintenance to release	2007-06-21 22:40:22 +00:00
Don Kjer	4ecb9cb63e	svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release	2007-05-01 21:39:25 +00:00
James Cook	12ac04231b	merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses	2007-02-15 20:24:08 +00:00