From a879e13055f0bb759ee12e708184e95d8bd9be30 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Wed, 12 Nov 2008 20:28:24 +0000
Subject: svn merge -c102054
 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015

QAR-1016 joystick+spacenav improvements MERGE
---
 doc/contributions.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'doc/contributions.txt')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 54aad6e1b1..9e3e79a57f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -13,9 +13,18 @@ Able Whitman
 Adam Marker
 	VWR-2755
 Aimee Trescothick
-  VWR-3336
+        VWR-3336
 	VWR-3903
 	VWR-4083
+	VWR-6348
+	VWR-6358
+	VWR-6360
+	VWR-6550
+	VWR-6583
+	VWR-6482
+	VWR-7383
+	VWR-8341
+	VWR-8482
 	VWR-9255
 Alejandro Rosenthal
 	VWR-1184
-- 
cgit v1.2.3