diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-02-14 09:57:32 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-02-14 09:57:32 -0500 |
commit | 547293305bdc6c345f52519db514bb5be34c72ef (patch) | |
tree | 91eeb740686d9f6b644df91175023183d19412c4 /doc | |
parent | a761351396d81c4de7598340c61bf9cd4115071f (diff) | |
parent | e15b543dd655e2b93d9cab1326b389b6b04a7522 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributions.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 1b08b91baf..a71ee88166 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -396,10 +396,7 @@ Jonathan Yap STORM-869 VWR-17801 VWR-24347 - STORM-844 - STORM-643 - STORM-960 - STORM-953 + STORM-975 Kage Pixel VWR-11 Ken March |