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/activity/activity.info')

diff --git a/Workshop.activity/activity/activity.info b/Workshop.activity/activity/activity.info
new file mode 100644
index 0000000..02dbee1
--- /dev/null
+++ b/Workshop.activity/activity/activity.info
@@ -0,0 +1,8 @@
+[Activity]
+name = Tutorius
+bundle_id = org.laptop.TutoriusActivity
+class = TutoriusActivity.TutoriusActivity
+icon = someicon
+activity_version = 1
+host_version = 1
+show_launcher = yes
--
cgit v0.9.1