From 23db57ad3b8610d49aa321f801270e4486f95282 Mon Sep 17 00:00:00 2001
From: Alexandre Antonino Gonçalves Martinazzo <alexandremartinazzo@gmail.com>
Date: Tue, 21 Aug 2007 16:30:36 +0000
Subject: Modifications on selection and gelection bounds (by pekayatt)

---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index a919bcc..3b76917 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 5
 ===
+<<<<<<< .mine
 Added 'Clear' button (alexandre)
+=======
+Modifications on selection and gelection bounds (pekayatt)
+>>>>>>> .r96
 Added rainbow effect (andremossinato)
 Side number for regular polygon can be choosen (alexandre)
 New shape available: Heart (andremossinato)
--
cgit v0.9.1