Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbens <bens@.(none)>2009-08-04 00:35:29 (GMT)
committer anishmangal2002 <anishmangal2002@gmail.com>2010-05-20 16:28:13 (GMT)
commitab55be61f9e1f844a66f912fcd0f3d6bb4eeaab8 (patch)
treedccf7fea2d3840ab3b00615177612ee645288e7a
parent0b9983ff9c0c4ffa1411e4f481c46f37d914c957 (diff)
Bump version and mimetypes, and update NEWS
(cherry picked from commit 93de8e77f9b2b737f2d322ce3e8f2bb5bb282a78)
-rw-r--r--NEWS4
-rw-r--r--activity/activity.info4
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index dba0e27..92063c3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+35
+* Add collaborative editing with Groupthink
+* Fix self-generated bundles by including port/ (and now groupthink/)
+
34
* Editor: enable autotabbing, space tabs,
and tab size = 2 (to ensure compatability with examples)
diff --git a/activity/activity.info b/activity/activity.info
index 4d4e32e..09f96a4 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,8 +4,8 @@ bundle_id = org.laptop.Pippy
service_name = org.laptop.Pippy
class = pippy_app.PippyActivity
icon = activity-icon
-activity_version = 34
-mime_types = text/x-python
+activity_version = 35
+mime_types = text/x-python, pickle/groupthink-pippy
show_launcher = yes
license = GPLv2+