From a1554b0d529e30f4f2c66d5e3c9c3d3783763978 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Fri, 25 May 2012 04:33:07 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
diff --git a/NEWS b/NEWS
index 5e961f6..c19d19a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+140
+
+ENHANCEMENTS:
+* New translations
+
+BUG FIX:
+* Blank out coordinate display when data are invalid (#3599)
+* Import CalledProcessError in audiograb.py
+
 139
 
 ENHANCEMENTS:
@@ -5,7 +14,6 @@ ENHANCEMENTS:
 * Autoshow blocks on Stop or Error
 * Move Show-Blocks button to Stop-Turtle button on main toolbar
 * Add --run flag to GNOME version for autorun on launch
-* New translations
 * New plugin strings
 * New translations
 (with help from Alan Jhonn Aguiar Schwyn and Andres Aguirre)
diff --git a/activity/activity.info b/activity/activity.info
index 5069aaf..9b5d94f 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Turtle Art
-activity_version = 139
+activity_version = 140
 license = MIT
 bundle_id = org.laptop.TurtleArtActivity
 exec = sugar-activity TurtleArtActivity.TurtleArtActivity
--
cgit v0.9.1