diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
commit | 4739976d0a96eb21b8f606c69ecc09ca7a1557de (patch) | |
tree | 57170dde71aee01aac39059ebd300a3e5aa9e7e3 /activity | |
parent | b81f399d5c57465e95cca0fac241975bc75df303 (diff) | |
parent | a7a87c7fa872418f8db1af7badd4c91e0481c2af (diff) |
Merge commit 'refs/merge-requests/3' of git://git.sugarlabs.org/turtleart/mainline into integration
Conflicts:
NEWS
activity/activity.info
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 5373b01..d8b7f81 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Turtle Art -activity_version = 122 +activity_version = 123 license = MIT bundle_id = org.laptop.TurtleArtActivity exec = sugar-activity TurtleArtActivity.TurtleArtActivity |