From de3cb8c0c9ab1bb2215338e1757bb231331e1c6c Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Thu, 19 Mar 2009 20:20:40 +0000
Subject: 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
---
(limited to 'src/sugar/tutorius/Makefile.am')

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
--
cgit v0.9.1