diff options
| author | mike <michael.jmontcalm@gmail.com> | 2009-12-01 20:11:43 (GMT) |
|---|---|---|
| committer | mike <michael.jmontcalm@gmail.com> | 2009-12-01 20:11:43 (GMT) |
| commit | 2c8fe66c0f7490c8aaaae27b4977b987001c6b71 (patch) | |
| tree | 32d4ce390d853fb5a8405e71cfb37b6b52988e3b /tests/actiontests.py | |
| parent | b7586af9d127e7954674d13ea185a0e84d197c37 (diff) | |
| parent | 50ec9ae6ebc7ecc088b5e0a6b79688a717271955 (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/tutorius/simpoirs-clone
Conflicts:
src/extensions/tutoriusremote.py
tutorius/TProbe.py
tutorius/creator.py
Diffstat (limited to 'tests/actiontests.py')
0 files changed, 0 insertions, 0 deletions