diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
commit | 7e3c32308c1f7d9e325fae55e7116b5fe3f460ca (patch) | |
tree | fac07085cf1b416ef3fb240961913758ebf6b435 /doc | |
parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
parent | 28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff) |
merge out 2.6.0 changes from viewer-development
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributions.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 560bedd518..f885f99f12 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -411,8 +411,12 @@ Jonathan Yap VWR-24347 STORM-975 STORM-990 + STORM-844 + STORM-643 STORM-1020 STORM-1064 + STORM-960 + STORM-953 Kage Pixel VWR-11 Ken March |