diff options
| author | Jean-Christophe Savard <savard.jean.christophe@gmail.com> | 2009-04-16 20:29:54 (GMT) |
|---|---|---|
| committer | Jean-Christophe Savard <savard.jean.christophe@gmail.com> | 2009-04-16 20:29:54 (GMT) |
| commit | 97b111acee9f613289950ce6904c010e86aa3fb8 (patch) | |
| tree | 228daebaaf3c58cfbf0c96e86def18ce1ee54f1f /src/sugar/tutorius/Makefile.am | |
| parent | 1b582880e9c1f85350165913d08aac2f1e1e934f (diff) | |
| parent | 291f5314c1dccbaf721f5de7425e3930fdf79575 (diff) | |
Merge of jc and origin jc
Merge branch 'jc' of ssh://bobthebuilder.mine.nu:8080/home/git into jc
Conflicts:
source/external/source/sugar-toolkit/src/sugar/activity/activity.py
source/external/source/sugar-toolkit/src/sugar/tutorius/Makefile.am
source/external/source/sugar-toolkit/src/sugar/tutorius/bundler.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sugar/tutorius/Makefile.am b/src/sugar/tutorius/Makefile.am index a74b796..8805314 100644 --- a/src/sugar/tutorius/Makefile.am +++ b/src/sugar/tutorius/Makefile.am @@ -9,5 +9,5 @@ sugar_PYTHON = \ services.py \ overlayer.py \ editor.py \ - linear_creator.py \ - bundler.py + linear_creator.py\ + bundler.py |