diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2011-04-13 15:50:47 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2011-04-13 15:50:47 (GMT) |
| commit | 6f532267225d546134b419bd1c72e8a100c889cc (patch) | |
| tree | 4afbffb43314baca551ff8426a3199615fd1ab51 | |
| parent | c01b466345d9c209d0dcfd0675fbf8176f6f5c64 (diff) | |
| parent | 1ca6ed7367e5c8cc35d24837768d0003df54b4ef (diff) | |
Merge branch 'master' of git.sugarlabs.org:stopwatch/stopwatch
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | activity/activity.info | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +8 + +*New templates for langs +*Restoring collaboration from icarito +*Fixing blank activity on 0.84 by James Cameron +*for stop use ctrl-q not shift-ctrl-q, dev.laptop.org #10786 by James Cameron + 7 *Patch for d.l.o#10787 by James Cameron diff --git a/activity/activity.info b/activity/activity.info index e5ec406..d5c6c2a 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,5 +3,5 @@ name = StopWatch bundle_id = org.laptop.StopWatchActivity class = activity.StopWatchActivity icon = activity-stopwatch -activity_version = 7 +activity_version = 8 show_launcher = yes |