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/arrow_back.png')

diff --git a/Workshop.activity/arrow_back.png b/Workshop.activity/arrow_back.png
new file mode 100644
index 0000000..8263674
--- /dev/null
+++ b/Workshop.activity/arrow_back.png
Binary files differ
--
cgit v0.9.1