diff options
| author | mike <michael.jmontcalm@gmail.com> | 2009-05-05 05:44:27 (GMT) |
|---|---|---|
| committer | mike <michael.jmontcalm@gmail.com> | 2009-05-05 05:44:27 (GMT) |
| commit | 6fa568daae3291c7a876cd903f04079a12945dcb (patch) | |
| tree | faa112d6dee15fa9d6dc340762e7a45878842bee /src/sugar/tutorius/Makefile.am | |
| parent | d66690142b643401429bfff84d42acac002e1980 (diff) | |
| parent | fb49b482f5bd478bada50cd1ab25a876806eff31 (diff) | |
Merge branch 'mike'
Conflicts:
source/external/source/sugar-toolkit/src/sugar/tutorius/actions.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.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 02f832b..7223c60 100644 --- a/src/sugar/tutorius/Makefile.am +++ b/src/sugar/tutorius/Makefile.am @@ -13,4 +13,5 @@ sugar_PYTHON = \ editor.py \ linear_creator.py \ constraints.py \ - properties.py + properties.py \ + bundler.py |