diff options
author | mike <michael.jmontcalm@gmail.com> | 2009-03-19 20:20:40 (GMT) |
---|---|---|
committer | mike <michael.jmontcalm@gmail.com> | 2009-03-19 20:20:40 (GMT) |
commit | de3cb8c0c9ab1bb2215338e1757bb231331e1c6c (patch) | |
tree | 98d99a66d829e5b94ba7392ee813e13b4e605ca9 /src/sugar/tutorius/Makefile.am | |
parent | 3d41146af5f136d156b5a1f0c65c553612fbd4b2 (diff) | |
parent | e20cfb534e276fa7762980bbdd6d633a7ce99ccc (diff) |
Merge branch 'tutorial_toolkit' into mike
Conflicts:
source/activities/Writus.activity/TAbiWordActivity.py
source/external/source/sugar-toolkit/src/sugar/graphics/window.py
source/external/source/sugar-toolkit/src/sugar/tutorius/Makefile.am
source/external/source/sugar-toolkit/src/sugar/tutorius/actions.py
source/external/source/sugar-toolkit/src/sugar/tutorius/overlayer.py
source/external/source/sugar-toolkit/src/sugar/tutorius/services.py
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/Makefile.am')
-rw-r--r-- | src/sugar/tutorius/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sugar/tutorius/Makefile.am b/src/sugar/tutorius/Makefile.am index 6fd32c7..1fb11e1 100644 --- a/src/sugar/tutorius/Makefile.am +++ b/src/sugar/tutorius/Makefile.am @@ -7,4 +7,5 @@ sugar_PYTHON = \ gtkutils.py \ filters.py \ services.py \ - overlayer.py + overlayer.py \ + editor.py |