From 8ab1e32a479c018766f330ecf71670ef71492300 Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 15 Apr 2009 02:55:10 +0000 Subject: Merge commit 'origin/lp349874' Conflicts: source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py source/external/source/sugar-toolkit/src/sugar/tutorius/tests/filterstests.py source/external/source/sugar-toolkit/src/sugar/tutorius/tests/gtkutilstests.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 deabd25..02f832b 100644 --- a/src/sugar/tutorius/Makefile.am +++ b/src/sugar/tutorius/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = uam + sugardir = $(pythondir)/sugar/tutorius sugar_PYTHON = \ __init__.py \ -- cgit v0.9.1