Differences

This shows you the differences between two versions of the page.

--- course_outline [2014/03/06 21:10] – allison
+++ course_outline [2014/03/20 16:56] (current) – allison
@@ Line 120: / Line 120: @@
 ===== Week 12 =====
-Presentation 1: [[ ]]
+Presentation 1: [[http://dx.doi.org/10.1109/HAPTIC.2002.998939 | Haptic guidance]] //Ankit//
-Presentation 2: [[ ]]
+Presentation 2: [[http://dx.doi.org/10.1109/TOH.2013.50 | Haptic discrimination]] //Brandon //
+===== Week 13 =====
+Presentation 1: [[http://dl.acm.org/citation.cfm?id=1778829 | Presence]] //Abeer//