From c14688d67a82b7ec7746beda90da915c98600a3d Mon Sep 17 00:00:00 2001
From: erick <erick@sugar-dev-erick.(none)>
Date: Sat, 05 Dec 2009 21:03:59 +0000
Subject: Merge branch 'frame_integration' into revamped_dragndrop

Conflicts:
	tutorius/actions.py
---
(limited to 'Workshop.activity/MANIFEST')

diff --git a/Workshop.activity/MANIFEST b/Workshop.activity/MANIFEST
new file mode 100644
index 0000000..c5c6d42
--- /dev/null
+++ b/Workshop.activity/MANIFEST
@@ -0,0 +1,5 @@
+TutoriusActivity.py
+activity/someicon.svg
+activity/activity.info
+setup.py
+MANIFEST
--
cgit v0.9.1