From 4efe2804ce1629a30dcb07dd2d72f2a461213e85 Mon Sep 17 00:00:00 2001
From: Marion <marion.zepf@gmail.com>
Date: Fri, 28 Jun 2013 10:17:44 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline

---
diff --git a/NEWS b/NEWS
index e57c952..6389551 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+182
+
+ENHANCEMENT:
+* New translations
+
+BUG FIXES:
+* Fixed problem with initializing trash palette when init_on_start
+  flag is set (Alan Aguiar)
+* Disambiguation of parent vs activity (Marion Zepf)
+* Isolation of GUI to enable non-interactive use of canvas (Marion Zepf)
+
 181
 
 BUG FIX:
diff --git a/activity/activity.info b/activity/activity.info
index 2ac16f2..ade868e 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = TurtleBlocks
-activity_version = 181
+activity_version = 182
 license = MIT
 bundle_id = org.laptop.TurtleArtActivity
 exec = sugar-activity TurtleArtActivity.TurtleArtActivity
--
cgit v0.9.1