From f5587ac7995feb4af14f23dd0f2dd389787758a6 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Wed, 09 Aug 2006 19:12:27 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
(limited to 'shell')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 408f6ed..82812dd 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -14,6 +14,7 @@ sugar_PYTHON =				\
 	ActivitiesModel.py		\
 	ActivityHost.py			\
 	ActivityRegistry.py		\
+	ChatController.py	\
 	ConsoleWindow.py		\
 	Emulator.py			\
 	Owner.py			\
--
cgit v0.9.1