diff options
| author | Wade Brainerd <wadetb@gmail.com> | 2009-03-02 04:49:03 (GMT) |
|---|---|---|
| committer | Wade Brainerd <wadetb@gmail.com> | 2009-03-02 04:49:03 (GMT) |
| commit | 70e5ee0719e4f0b496c2e4a8bb6818f1bd4b9b14 (patch) | |
| tree | 451e1547279870d8207a87a9d7fa77ba200d4230 /activity | |
| parent | 38667fa1b6dc733d44ce6dfc21a2d403b3f79579 (diff) | |
| parent | 5628f7aa302a1152a352497d3bb0734b3c9ae97a (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/terminal/mainline
Conflicts:
activity/activity.info
terminal.py
Diffstat (limited to 'activity')
| -rw-r--r-- | activity/activity.info | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activity/activity.info b/activity/activity.info index 9f42339..a8242fd 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Terminal -activity_version = 22 +activity_version = 24 service_name = org.laptop.Terminal exec = sugar-activity terminal.TerminalActivity icon = activity-terminal |