Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed pippy code. | Sebastian Silva | 2011-10-01 | 1 | -4/+42 |
| | | | | | | Conflicts: activity/activity.info pippy_app.py | ||||
* | Merge branch 'master' of git://git.sugarlabs.org/screencast/screencast | Sebastian Silva | 2011-10-01 | 1 | -0/+206 |
Conflicts: pippy_app.py |