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	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
Don Kjer	13c391f198	EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999	2007-09-14 21:13:20 +00:00
Don Kjer	e5124431b5	svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release	2007-07-02 17:10:30 +00:00
Kelly Washington	e03bb0606a	merge -r62831:64079 branches/maintenance to release	2007-06-21 22:40:22 +00:00