Commit Graph

15 Commits (dc2684fa1de8f85fe2e7f4cb9a11dc36efdc4e79)

Author SHA1 Message Date
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
Don Kjer 9754d265eb EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
2007-12-06 18:18:35 +00:00
Josh Bell e5057b4747 svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release 2007-11-21 02:29:23 +00:00
Kent Quirk 138bf17c3c merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112. 2007-11-15 19:10:29 +00:00
Leyla Farazha 1e7917fa89 Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://svn/svn/linden/branches/viewer-auth-server-2 2007-11-02 21:26:41 +00:00
Melinda Green 07c24d0437 Passed QA, merging minifriends-3:70006 back to release 2007-09-19 21:28:44 +00:00
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
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
Tess Chu 3b2515fd5f merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
Added tests to version manager and fixed failed tests.  Paired by rdw and Tess.
2007-08-10 02:15:37 +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
Brad Kittenbrink 029130bf9c svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release 2007-05-23 21:17: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
Steven Bennetts 934e15973e merge release@57486 release-candidate@57503 2007-01-31 19:36:32 +00:00
Steven Bennetts 71d28bdbf0 merge release@56803 release-candidate@56833 2007-01-17 23:02:00 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00