diff options
| author | Jonathan Yap <none@none> | 2011-02-25 20:21:54 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-02-25 20:21:54 -0500 |
| commit | 513fdff9cd8969d7351016902d8304306f739f4e (patch) | |
| tree | a42da46c9be6c89b96cbf02f7125ae009890a787 /doc/contributions.txt | |
| parent | eff712570d389d1b7b36153c48b17d906d5eada3 (diff) | |
| parent | 9962560f57eb4bcf1b3451f5d86c963d5d6fcf5c (diff) | |
STORM-990 merge with current v-d & fixed merge conflict
Diffstat (limited to 'doc/contributions.txt')
| -rw-r--r-- | doc/contributions.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 2bee8c44bc..0993353657 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -86,6 +86,7 @@ Aleric Inglewood VWR-24320 VWR-24321 VWR-24354 + VWR-24366 VWR-24519 SNOW-84 SNOW-477 @@ -391,10 +392,15 @@ Jonathan Yap STORM-812 STORM-829 STORM-844 + STORM-953 + STORM-960 STORM-869 + STORM-974 + STORM-975 + STORM-979 + STORM-980 VWR-17801 VWR-24347 - STORM-975 STORM-990 Kage Pixel VWR-11 |