Commit Graph

29 Commits (70aaa3e444cf9cb067addcbdde237762bd62fcf4)

Author SHA1 Message Date
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
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 0277259455 svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-11 17:54:18 +00:00
Josh Bell 98740db8fd svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-04 19:49:24 +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
Josh Bell c93c38e047 svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-21 19:36:11 +00:00
Karen Clark fceae96eb1 svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release. 2007-03-20 22:21:42 +00:00
Steven Bennetts 5e9e67cb2d merge -r 59028:59178 maintenance -> release. 2007-03-16 20:39:40 +00:00
Josh Bell 00dbacb215 svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release 2007-03-14 23:03:50 +00:00
Steven Bennetts cf40518428 merge -r 58986:59028 maintenance 2007-03-09 22:55:16 +00:00
Josh Bell b36dc36306 svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-09 01:09:20 +00:00
Steven Bennetts 14360b815e merge -r 58641:58711 maintenance -> release 2007-03-06 00:37:09 +00:00
Steven Bennetts 4dabd9c047 merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
Steven Bennetts 647d29b1a2 merge -r 58285:58437 maintenance. 2007-02-27 01:03:39 +00:00
Josh Bell 7dada07dba svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance 2007-02-20 22:02:36 +00:00
Richard Nelson 73bc0fb42b merge -r 56779:58057 /branches/selection_management 2007-02-17 03:02:16 +00:00
Aaron Brashears 5cc44523f7 Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release. 2007-02-09 23:35:12 +00:00
Mark Lentczner d0d4670f49 merge in of error-refactor-3
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
2007-02-06 00:57:33 +00:00
Steven Bennetts d1582a5105 merge -r 57111:57464 maintenance. 2007-02-05 20:20:42 +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
Steven Bennetts 934e15973e merge release@57486 release-candidate@57503 2007-01-31 19:36:32 +00:00
Steven Bennetts ad94bca0d2 merge -r 56696:57082 Branch_1-13-2 2007-01-24 20:21:23 +00:00
Steven Bennetts 73f0b5029a merge -r 56738:56842 maintenance. 2007-01-18 00:36:25 +00:00
Steven Bennetts 71d28bdbf0 merge release@56803 release-candidate@56833 2007-01-17 23:02:00 +00:00
Josh Bell aeb6d0c93c svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance 2007-01-15 18:49:02 +00:00
Josh Bell 8c344f4da0 svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance 2007-01-09 20:19:31 +00:00
Josh Bell fbf49910f3 svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance 2007-01-08 21:43:30 +00:00
Aaron Brashears 4617a37edf corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762 2007-01-03 21:05:41 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00