Commit Graph

56 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Sam Kolb b2595c369f Merge sl-search-opt-in back into the release branch
Reviewed by Josh and Don
2007-08-30 22:11:52 +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
Steven Bennetts e27e86e033 merge -r 66456:66594 Branch_1-18-1 -> release
Includes voice-server-changes (0:66493)
2007-07-27 21:54:03 +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
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