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
Jon Wolk	7dd08303a3	svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134	2007-12-19 00:56:59 +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
Josh Bell	2638f12f95	svn merge -r 63833:63894 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-17-0 --> release Pick up patches committed to 1.17: * Commented out metrics code that seems to be causing a crash. * Adding metrics to deployed code. added missing __hash__ function to lluuid.py, which fixes using uuid's as keys in maps * Reverting fix for SL-25905; probably cause of script-vieweing exploit on agni. * Removed deploy key checks from farm	2007-06-17 22:27:09 +00:00
Kelly Washington	3e9872a297	merge -r61423:62602 svn/branches/maintenance --> release	2007-05-30 17:39:09 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00