From 793fe68c0013147438a79c0a078c6ead381aa8cc Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Tue, 05 Jun 2012 04:32:26 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
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
--
cgit v0.9.1