phoenix-firestorm

Author	SHA1	Message	Date
Kelly Washington	dc48f1c741	svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448	2008-04-03 22:50:22 +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
Aaron Brashears	f118e7c80b	result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 \| patch -p0 in release	2007-06-13 18:02:37 +00:00
Josh Bell	ea8fb7238e	svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release	2007-03-31 01:41:19 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00