diff options
| author | Walter Bender <walter@sugarlabs.org> | 2010-03-17 18:39:20 (GMT) |
|---|---|---|
| committer | Walter Bender <walter@sugarlabs.org> | 2010-03-17 18:39:20 (GMT) |
| commit | 81ba8fd9fa0e2fbbee1ef3534a96104de4cd7079 (patch) | |
| tree | 500a2837580b12358f79322621acdbd39b8be5e2 | |
| parent | b4e53af65b5bb6a8ec2e3f6f5e5e424ab2c01ea0 (diff) | |
| parent | f1d5ed75c29961a718eb3c59fde1663c184f20cf (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/turtleart/refactoringv83
Conflicts:
NEWS
activity/activity.info
tagplay.py
tawindow.py
