diff options
author | mike <michael.jmontcalm@gmail.com> | 2009-12-04 02:21:14 (GMT) |
---|---|---|
committer | mike <michael.jmontcalm@gmail.com> | 2009-12-04 02:21:14 (GMT) |
commit | 49ab39870266196f6267f83dd6951f839ebde773 (patch) | |
tree | 116fb1552882edf5b4e42bbcc293c5ec918abca4 /setup.py | |
parent | b8c9419f0381c1864035af76853ed1c02ad434cc (diff) | |
parent | 243d29608df4816f791c98407c10fa8a702574e1 (diff) |
Merge ../../simpoirs-clone into remote_integration
Conflicts:
src/extensions/tutoriusremote.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions