From 4739976d0a96eb21b8f606c69ecc09ca7a1557de Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Tue, 08 Nov 2011 00:12:29 +0000
Subject: Merge commit 'refs/merge-requests/3' of git://git.sugarlabs.org/turtleart/mainline into integration

Conflicts:
	NEWS
	activity/activity.info
---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 67881c6..3040c24 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+123
+
+ENHANCEMENTS
+* Using Cairo graphics
+ - antialiasing
+ - rotation of text and images
+ - filled arcs
+
+NOTE
+* For performance reasons, the coordinate grids are now drawn directly
+  onto the turtle canvas. This has two consequences: (1) the grids cannot
+  be erased except by erasing the entire screen; and (2) the turtle can
+  draw on top of the grid.
+
 122
 
 ENHANCEMENTS
@@ -26,6 +40,7 @@ ENHANCEMENTS
 BUG FIXES
 * Fixed type error introduced to arc commands by patch to address #3164
 
+
 118
 
 ENHANCEMENTS
--
cgit v0.9.1