diff options
| author | mike <michael.jmontcalm@gmail.com> | 2009-03-06 16:54:16 (GMT) |
|---|---|---|
| committer | mike <michael.jmontcalm@gmail.com> | 2009-03-06 16:54:16 (GMT) |
| commit | 510e50936c9fe10edf369e3e51fc5768cb6f3b96 (patch) | |
| tree | 42a9d015199d3c5e0a49ed6ce4cce63bb44ba5cf /src/sugar/tutorius/core.py | |
| parent | 37e224a7301ab8a5845bb688e452a6c186403ba7 (diff) | |
| parent | d828a9f7ec6f678d02a0a84943e3e7ec1daaa8b0 (diff) | |
Merge commit 'origin/mike' into mike
Conflicts:
source/activities/Writus.activity/TAbiWordActivity.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/coretests.py
Diffstat (limited to 'src/sugar/tutorius/core.py')
0 files changed, 0 insertions, 0 deletions