6 Commits (efca9657a22ebbcacee705c00cac4e803f2ffa98)

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	0a5c9731fd	Result of svn merge -r105061:106057 svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074	2008-12-18 01:30:09 +00:00
Steven Bennetts	63e7894148	QAR-570 maint-render-4 merge ... merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.	2008-05-08 18:41:20 +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
Tess Chu	57b8fef824	svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.	2007-07-11 21:29:02 +00:00
Aaron Brashears	08d746156b	Result of svn merge -r59717:60410 svn+ssh://svn/svn/linden/branches/adroit.2007-03-13 into release.	2007-05-03 21:48:14 +00:00