From e784a2f0b92ecaf46a77ddca94b31fcc86e0cbae Mon Sep 17 00:00:00 2001 From: mike Date: Fri, 17 Apr 2009 04:36:31 +0000 Subject: 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 --- (limited to 'src/sugar/tutorius/Makefile.am') diff --git a/src/sugar/tutorius/Makefile.am b/src/sugar/tutorius/Makefile.am index 02f832b..8805314 100644 --- a/src/sugar/tutorius/Makefile.am +++ b/src/sugar/tutorius/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = uam - sugardir = $(pythondir)/sugar/tutorius sugar_PYTHON = \ __init__.py \ @@ -11,6 +9,5 @@ sugar_PYTHON = \ services.py \ overlayer.py \ editor.py \ - linear_creator.py \ - constraints.py \ - properties.py + linear_creator.py\ + bundler.py -- cgit v0.9.1