diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-09-19 13:13:37 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-09-19 13:13:37 -0400 |
commit | eaef5e63d5f5e3177fbd13de41aea12340f2fa30 (patch) | |
tree | 4da9c9af2741b2d33eb05cebe0291e50aada88ba /doc/contributions.txt | |
parent | 195d319f65239238577ae15c22188da3839ae5cf (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
Merge. Pull in viewer-release after materials viewer release.
Diffstat (limited to 'doc/contributions.txt')
-rwxr-xr-x | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index a6d522de2f..0035d4f597 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -679,6 +679,8 @@ Kagehi Kohn Kaimen Takahe Katharine Berry STORM-1900 + STORM-1940 + STORM-1941 Keklily Longfall Ken Lavender Ken March |