diff options
| author | hither2forlorn <vaibhawp@yahoo.co.uk> | 2010-03-01 08:35:25 (GMT) |
|---|---|---|
| committer | hither2forlorn <vaibhawp@yahoo.co.uk> | 2010-03-01 08:35:25 (GMT) |
| commit | 101c4b018cdd587802518cecb6f91af9e20407f6 (patch) | |
| tree | 90346903f3a0d9a4d095747cd71c1e48da4e388f /examples/2_English_What_SomeOne_Is_Doing/assets/images/icons/gotoLesson.png | |
| parent | 76e4e16aeb1db6c6793df091759f9aa5ef70e41c (diff) | |
| parent | b0ae77c94fe9b857538bd983092f02a474a423dd (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/karma/mainline
Conflicts:
examples/English_Animal_Identification/index.html
examples/English_Animal_Identification/js/lesson.js
Diffstat (limited to 'examples/2_English_What_SomeOne_Is_Doing/assets/images/icons/gotoLesson.png')
0 files changed, 0 insertions, 0 deletions