phoenix-firestorm

Author	SHA1	Message	Date
Brad Kittenbrink	6d52efe452	Merge of windlight into release (QAR-286). This includes all changes in windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620	2008-02-27 18:58: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
Don Kjer	1c909afe39	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release	2007-05-02 21:24:47 +00:00
Aaron Brashears	305c74d516	Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.	2007-02-02 17:28:58 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00