diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-02-03 10:32:05 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-02-03 10:32:05 -0500 |
commit | 957b8b15e1dc799c6f9b1c8dd42903f4c3f911f8 (patch) | |
tree | d9c99b4ea080a97ae6506bcec4c9859ea989271e /doc/contributions.txt | |
parent | 5bd5d918caa63338a678e2c94db9195f77867e8a (diff) | |
parent | b15b43b14e2e2d1afd602e3c7e3cfbfb15716a03 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r-- | doc/contributions.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 519df22b93..8d58cdf60d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -375,22 +375,23 @@ JB Kraft Joghert LeSabre VWR-64 Jonathan Yap + STORM-435 STORM-523 STORM-596 STORM-615 STORM-616 + STORM-643 STORM-679 STORM-723 STORM-726 STORM-737 - STORM-869 STORM-785 STORM-812 STORM-829 + STORM-844 + STORM-869 VWR-17801 VWR-24347 - STORM-844 - STORM-643 Kage Pixel VWR-11 Ken March |