diff options
author | mike <michael.jmontcalm@gmail.com> | 2009-04-17 04:36:31 (GMT) |
---|---|---|
committer | mike <michael.jmontcalm@gmail.com> | 2009-04-17 04:36:31 (GMT) |
commit | e784a2f0b92ecaf46a77ddca94b31fcc86e0cbae (patch) | |
tree | 56e23c87959b877e70614e0692b158eae2fd4fc8 /src/sugar/tutorius/uam/Makefile.am | |
parent | e3633a2cc4a5aa061172f4962da86ce346151ff8 (diff) | |
parent | 544b836dab71d36290d3da5131afaef77c88ccd8 (diff) |
Merge branch 'jc_support' into mike
Conflicts:
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/coretests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
Diffstat (limited to 'src/sugar/tutorius/uam/Makefile.am')
0 files changed, 0 insertions, 0 deletions