diff options
| author | Marion <marion.zepf@gmail.com> | 2013-06-21 15:15:16 (GMT) |
|---|---|---|
| committer | Marion <marion.zepf@gmail.com> | 2013-06-21 15:15:16 (GMT) |
| commit | f6a1b8a776edb031709e79c8f45db0fc3340a0ec (patch) | |
| tree | 72b8bd40a3ed707ec55d66ce3972d67cb4537913 /activity/activity.info | |
| parent | 42db6932927075c68ba8f2acf2bb4c585486516f (diff) | |
| parent | 4fededf1be849b0026f8d864a1d4fa071597e01e (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline
Conflicts:
TurtleArt/tawindow.py -- accepted everything from mainline
Diffstat (limited to 'activity/activity.info')
0 files changed, 0 insertions, 0 deletions