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-16 14:35:19 (GMT)
committer Marion <marion.zepf@gmail.com>2013-06-16 14:35:19 (GMT)
commit7a9f3285d5e68cea2727c7e606d549890db5c22d (patch)
tree6e11a64724e9eee11d2c53080605ff9fb0f5ab74
parent4fccd3e35a52337dff7bc5b01fe2b8495136c296 (diff)
parent0a992db780ac740c159e189d0c1bc3b8cccb9e7c (diff)
Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline
-rw-r--r--NEWS7
-rw-r--r--activity/activity.info2
2 files changed, 7 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index b38fb92..e57c952 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,15 @@
+181
+
+BUG FIX:
+* Make sure trash is last palette
+
180
ENHANCEMENT:
* Faster launch time
* New translations
-BUG FIXES:
+BUG FIX:
* Catch exception raised when gconf is not available (prevented launch
on some old systems, e.g., Peru 802)
diff --git a/activity/activity.info b/activity/activity.info
index 7dca52a..2ac16f2 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = TurtleBlocks
-activity_version = 180
+activity_version = 181
license = MIT
bundle_id = org.laptop.TurtleArtActivity
exec = sugar-activity TurtleArtActivity.TurtleArtActivity