From 05a407d56bd608e4b3bc906a7c6adf100d2330f8 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Mon, 26 Sep 2011 04:31:00 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
diff --git a/NEWS b/NEWS
index c0058f2..1c77b3b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+115
+
+ENHANCEMENTS
+* Support for light sensor on XO 1.75 hardware
+* New translations
+
+BUG FIXES
+* Returning float values from sensors as per OLPC #11166
+
 114
 
 ENHANCEMENTS
diff --git a/activity/activity.info b/activity/activity.info
index bd38e7c..b100fbd 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Turtle Art
-activity_version = 114
+activity_version = 115
 license = MIT
 bundle_id = org.laptop.TurtleArtActivity
 exec = sugar-activity TurtleArtActivity.TurtleArtActivity
--
cgit v0.9.1