From e14d11a8b88304ed264484d2aeb47cb6b49b2c69 Mon Sep 17 00:00:00 2001
From: John (J5) Palmieri <johnp@redhat.com>
Date: Thu, 23 Aug 2007 20:26:20 +0000
Subject:  Release version 6.

---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 3b76917..d509173 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,8 @@
-5
+6
+
 ===
-<<<<<<< .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