Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPootle daemon <pootle@pootle.sugarlabs.org>2012-06-05 04:32:26 (GMT)
committer Pootle daemon <pootle@pootle.sugarlabs.org>2012-06-05 04:32:26 (GMT)
commit793fe68c0013147438a79c0a078c6ead381aa8cc (patch)
tree401e7b3b1310ebd121b90662a3036ed0aaf2fa20
parentc2e2b9523a002fd9eb997afd46656f3e1cd0487b (diff)
parentd09bd53649eaf8bab129aff53aa4b52e81189508 (diff)
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
-rw-r--r--NEWS11
-rw-r--r--activity/activity.info2
2 files changed, 12 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index df704f5..c6af1be 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+142
+
+ENHANCEMENT:
+* Improved sensor calibration for XO 1.75 (Thanks to Tony Forster,
+ Guzman Trindad, James Cameron, and John Watlington)
+* Add media pause, resume, and stop
+
+BUG_FIX:
+* Properly offset video window when toolbars are opened/closed or
+ window is in fullscreen mode
+
141
BUG FIXES:
diff --git a/activity/activity.info b/activity/activity.info
index c7ba3d4..04a6db1 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Turtle Art
-activity_version = 141
+activity_version = 142
license = MIT
bundle_id = org.laptop.TurtleArtActivity
exec = sugar-activity TurtleArtActivity.TurtleArtActivity