Commit Graph

13 Commits (cc2f19ebd084c309be77ff1e4c8ed4b001cbdb36)

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
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
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +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
Christian Goetze 5ec8bbbe22 svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 2007-10-10 00:01:43 +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
Monroe Williams 7138fb673a Merge down from Branch_1-18-1:
svn merge --ignore-ancestry  svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-08-02 01:18:34 +00:00
Don Kjer 4ecb9cb63e svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
Josh Bell ea8fb7238e svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-31 01:41:19 +00:00
Steven Bennetts 068558f888 merge release@58791 vc8@58828 -> release
Adds Dev Studio 2005 (VC8)
Reviewed by Rob
2007-03-07 02:48:44 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00