Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/activity
diff options
context:
space:
mode:
authorJames Cameron <quozl@laptop.org>2011-08-05 04:39:16 (GMT)
committer James Cameron <quozl@laptop.org>2011-08-05 04:39:16 (GMT)
commit8c73356ca84f785b9e82f3d8eb8ab26852be8fa4 (patch)
tree3c4e632871545d74664637301b0c96f0746abbe9 /activity
parente30a00226eedd2711aabf269e5147562d15562d0 (diff)
parent38dc501c50f0728fa785b6f249f52bbcf18ce32b (diff)
Merge git://git.sugarlabs.org/log/mainlineHEADmaster
Conflicts: logviewer.py
Diffstat (limited to 'activity')
-rw-r--r--activity/activity.info2
1 files changed, 1 insertions, 1 deletions
diff --git a/activity/activity.info b/activity/activity.info
index 4bd8f73..cb611cb 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Log
-activity_version = 24
+activity_version = 25
bundle_id = org.laptop.Log
exec = sugar-activity logviewer.LogActivity -s
icon = activity-log