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
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
Steven Bennetts	4dabd9c047	merge release@58699 beta-1-14-0@58707 -> release	2007-03-02 21:25:50 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00