From 7a9f3285d5e68cea2727c7e606d549890db5c22d Mon Sep 17 00:00:00 2001
From: Marion <marion.zepf@gmail.com>
Date: Sun, 16 Jun 2013 14:35:19 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline

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