From ed386ae547c225e352c39e8d14921572ee534b0b Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 18 Jul 2008 17:50:25 +0000 Subject: merge support-featurettes-snapshot-merge-2 for QAR-754, includes: * featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes --- doc/contributions.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 0206ced949..4fb1de87eb 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -143,7 +143,9 @@ Gigs Taggart VWR-1434 VWR-1987 VWR-2065 + VWR-2491 VWR-2502 + VWR-2331 Ginko Bayliss VWR-4 Grazer Kline @@ -154,6 +156,7 @@ Gudmund Shepherd Hamncheese Omlet VWR-333 Henri Beauchamp + VWR-1320 VWR-1406 VWR-4157 Hikkoshi Sakai @@ -262,6 +265,7 @@ Nicholaz Beresford VWR-1721 VWR-1723 VWR-1732 + VWR-1754 VWR-1769 VWR-1808 VWR-1861 -- cgit v1.2.3