From 700ff84c2072f7cf0e62955c186e177c2f99b8d4 Mon Sep 17 00:00:00 2001
From: Ariel Calzada <ariel@activitycentral.com>
Date: Tue, 24 Jan 2012 17:06:39 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:classroomviewer/classroomviewer

---
diff --git a/activity/activity.info b/activity/activity.info
index 406fb0a..652efd1 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,7 @@
 [Activity]
 name = ClassRoomViewer
-activity_version = 3
+activity_version = 1
 bundle_id = org.laptop.ClassRoomViewer
 exec = sugar-activity classroomviewer_activity.ClassRoomViewerActivity
 icon = activity-classroomviewer
-license = GPLv2+
+license = GPLv3+
--
cgit v0.9.1