From dcf97548c42b1b43e3ebb6b06fdbd15e65736e52 Mon Sep 17 00:00:00 2001
From: Ian Bicking <ianb@lothlorien.localdomain>
Date: Mon, 02 Oct 2006 23:15:34 +0000
Subject: Merge branch 'master' of git://dev.laptop.org/sugar

---
(limited to 'shell')

diff --git a/shell/view/frame/Makefile.am b/shell/view/frame/Makefile.am
index 8d95114..01458cc 100644
--- a/shell/view/frame/Makefile.am
+++ b/shell/view/frame/Makefile.am
@@ -1,9 +1,9 @@
 sugardir = $(pkgdatadir)/shell/view/frame
 sugar_PYTHON =				\
 	__init__.py			\
+	ActivitiesBox.py		\
 	RightPanel.py			\
 	PanelWindow.py			\
 	Frame.py			\
-	TopPanel.py			\
-	BottomPanel.py			\
+	ZoomBox.py			\
 	MenuStrategy.py
--
cgit v0.9.1