Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarion <marion.zepf@gmail.com>2013-06-28 10:17:44 (GMT)
committer Marion <marion.zepf@gmail.com>2013-06-28 10:17:44 (GMT)
commit4efe2804ce1629a30dcb07dd2d72f2a461213e85 (patch)
tree14fcbd2693e2bc5499186784a4f7081df7d6f9aa
parentf6a1b8a776edb031709e79c8f45db0fc3340a0ec (diff)
parent238638fd571724cc92eccb9d95dd551149972da7 (diff)
Merge branch 'master' of git://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 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