Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revisionBoth sides next revision | ||
lirec_notes [2009-02-24 11:05] – davegriffiths | lirec_notes [2010-05-05 11:12] – davegriffiths | ||
---|---|---|---|
Line 10: | Line 10: | ||
* [[Models of Social Intelligence]] | * [[Models of Social Intelligence]] | ||
* [[Theory of Mind in Robotics]] | * [[Theory of Mind in Robotics]] | ||
+ | * [[Psychological Models of Empathy]] | ||
=====Ethics===== | =====Ethics===== | ||
Line 66: | Line 67: | ||
* [[lirec: | * [[lirec: | ||
* [[lirec: | * [[lirec: | ||
+ | * [[lirec: | ||
=====Meeting notes===== | =====Meeting notes===== | ||
Line 76: | Line 78: | ||
[[http:// | [[http:// | ||
- |