9 Commits (2aa981ac23bbdf2fd609e04434179be0cfec79ce)

Author	SHA1	Message	Date
Christian Goetze	e588d1f284	svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654 ... QAR-1654 merge completed.	2009-07-01 00:22:05 +00:00
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
Steven Bennetts	25c10ed028	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release ... dataserver-is-deprecated	2008-06-26 00:39:00 +00:00
Bryan O'Sullivan	9db949eec3	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge ... dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers	2008-06-02 21:14:31 +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
Don Kjer	b089fc559a	EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release ... ** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release ** ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556 RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa	2007-09-28 23:32:53 +00:00
Kelly Washington	e03bb0606a	merge -r62831:64079 branches/maintenance to release	2007-06-21 22:40:22 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00