Commit Graph

15 Commits (df4d167cd13fd89a85e4d30dca94e40c934707d7)

Author SHA1 Message Date
Josh Bell df4d167cd1 svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-21 06:44:41 +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
Aaron Brashears 80dfa222fd Result of svn merge -r69150:69158 svn+ssh://svn/svn/linden/branches/named-queries-py3 into release. 2007-09-10 20:10:56 +00:00
Kartic Krishnamurthy 52cb2aea86 svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1 2007-08-08 00:55:57 +00:00
Kartic Krishnamurthy e1ab7d8a30 svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix
NOTE: r63705 is *not* the earliest rev# for dpo-3-bug-fix.
2007-07-18 01:28:59 +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 f118e7c80b result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
Don Kjer eb3731a3ca svn merge -r 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:52:29 +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
Don Kjer ae588e76f1 svn merge -r 58913:59058 svn+ssh://svn/svn/linden/branches/rez-content-loss-1 into release 2007-04-05 16:23:03 +00:00
Kelly Washington 1ada34fc0c merge -r58842:59035 branches/loadstone-names to release 2007-03-16 17:29:45 +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
Kelly Washington 437882ca3b merge r58577:58578 Branch_1-13-3 to release 2007-03-05 19:08:01 +00:00
Steven Bennetts 934e15973e merge release@57486 release-candidate@57503 2007-01-31 19:36:32 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00